equal
deleted
inserted
replaced
23 merge.priority=-100 |
23 merge.priority=-100 |
24 |
24 |
25 gpyfm.gui=True |
25 gpyfm.gui=True |
26 |
26 |
27 meld.gui=True |
27 meld.gui=True |
28 meld.args=--label='local' $local --label='base' $base --label='other' $other -o $output |
28 meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output |
29 meld.check=changed |
29 meld.check=changed |
30 meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child |
30 meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child |
31 |
31 |
32 tkdiff.args=$local $other -a $base -o $output |
32 tkdiff.args=$local $other -a $base -o $output |
33 tkdiff.gui=True |
33 tkdiff.gui=True |