Show More
@@ -25,7 +25,7 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=' |
|
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 |
General Comments 0
You need to be logged in to leave comments.
Login now