| changeset 18972 | 3de9b1f9ebc3 |
| parent 18971 | c4266e9afc4f |
| child 21099 | 12c7cea6235c |
--- a/contrib/mergetools.hgrc Thu Feb 21 14:49:25 2013 +0100 +++ b/contrib/mergetools.hgrc Tue Apr 16 13:55:38 2013 +0200 @@ -25,7 +25,7 @@ gpyfm.gui=True meld.gui=True -meld.args=--label='local' $local --label='base' $base --label='other' $other -o $output +meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output meld.check=changed meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child