mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30

use diffy_imara::{PatchFormatter, create_patch};

mod common;
use common::merge;

#[test]
fn timeout_support() {
    let output = merge()
        .arg("tests/data/java/working/move_and_modify_conflict/Base.java")
        .arg("tests/data/java/working/move_and_modify_conflict/Left.java")
        .arg("tests/data/java/working/move_and_modify_conflict/Right.java")
        .arg("--base-name=BASE")
        .arg("--left-name=LEFT")
        .arg("--right-name=RIGHT")
        .arg("--timeout=1")
        .output()
        .expect("failed to execute `mergiraf merge`");

    let actual = str::from_utf8(&output.stdout).unwrap();
    let expected =
        include_str!("data/java/working/move_and_modify_conflict/ExpectedLineBased.java");

    if expected != actual {
        let patch = create_patch(expected, actual);
        let f = PatchFormatter::new().with_color();
        print!("{}", f.fmt_patch(&patch));
        eprintln!("test failed: outputs differ");
        panic!();
    }
}