Panic on 3-way merge

[mxfunc]

Test Case:

fn main() {

let base = r#"
class GithubCall(db.Model):

`url`: URL of request Example.`https://api.github.com`"#;

    let theirs = r#"
class GithubCall(db.Model):

`repo`: String field. Github repository fields. Example: `amitu/python`"#;

    let ours = r#"
class Call(models.Model):
`body`: String field. The payload of the webhook call from the github.

`repo`: String field. Github repository fields. Example: `amitu/python`"#;

    println!("Diffy merge test");
    match diffy::merge(base, ours, theirs) {
        Ok(s) => {
            println!("{}", s);
        }
        Err(s) => {
            println!("{}", s);
        }
    }
}

Findings:

• The panic disappears if the clean_conficts function is commented.
• The panic disappears if the ConflictStyle is changed from ConflictStyle::Diff3 to ConflictStyle::Merge

[bmwill]

@mxfunc Thank you so much for the bug report! I think I've already identified the issue and will have a fix out shortly.

[mxfunc]

Thanks @bmwill for the super fast fix!

[bmwill]

Of course! Please let me know if you find any other issues :)