changeset 18971 | c4266e9afc4f |
parent 18695 | ec9b9968b7f8 |
child 18972 | 3de9b1f9ebc3 |
--- a/contrib/mergetools.hgrc Tue Apr 16 09:44:29 2013 -0500 +++ b/contrib/mergetools.hgrc Thu Feb 21 14:49:25 2013 +0100 @@ -25,7 +25,8 @@ gpyfm.gui=True meld.gui=True -meld.args=--label='local' $local --label='base' $base --label='other' $other +meld.args=--label='local' $local --label='base' $base --label='other' $other -o $output +meld.check=changed meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child tkdiff.args=$local $other -a $base -o $output