Mercurial > hg
changeset 18972:3de9b1f9ebc3
mergetools: rename 'base' to 'merged' in meld
This makes it clear which panel is the target of the merge operation.
| author | ronvoe12249 <ronny.voelker@elaxy.com> |
|---|---|
| date | Tue, 16 Apr 2013 13:55:38 +0200 |
| parents | c4266e9afc4f |
| children | 5f9019e6d451 |
| files | contrib/mergetools.hgrc |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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