Show More
@@ -26,7 +26,7 b' merge.priority=-100' | |||
|
26 | 26 | gpyfm.gui=True |
|
27 | 27 | |
|
28 | 28 | meld.gui=True |
|
29 | meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output | |
|
29 | meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output --auto-merge | |
|
30 | 30 | meld.check=changed |
|
31 | 31 | meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child |
|
32 | 32 |
General Comments 0
You need to be logged in to leave comments.
Login now