Show More
@@ -25,7 +25,8 b' merge.priority=-100' | |||||
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 |
|
28 | meld.args=--label='local' $local --label='base' $base --label='other' $other -o $output | |
|
29 | meld.check=changed | |||
29 | meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child |
|
30 | meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child | |
30 |
|
31 | |||
31 | tkdiff.args=$local $other -a $base -o $output |
|
32 | tkdiff.args=$local $other -a $base -o $output |
General Comments 0
You need to be logged in to leave comments.
Login now