Mercurial > hg
changeset 18971:c4266e9afc4f
mergetools: avoid losing the merged version with meld
Add -o $output.
When using Meld as intended (merge from left and right into the center panel),
the merged version is written to the wrong file without this option ($base,
a temporary file, which is ignored by Mercurial).
Add meld.check=changed as a secondary safety net.
| author | ronvoe12249 <ronny.voelker@elaxy.com> |
|---|---|
| date | Thu, 21 Feb 2013 14:49:25 +0100 |
| parents | 3cdb6f2f6789 |
| children | 3de9b1f9ebc3 |
| files | contrib/mergetools.hgrc |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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