Mercurial > hg
comparison contrib/mergetools.hgrc @ 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 | ec9b9968b7f8 |
children | 3de9b1f9ebc3 |
comparison
equal
deleted
inserted
replaced
18970:3cdb6f2f6789 | 18971:c4266e9afc4f |
---|---|
23 merge.priority=-100 | 23 merge.priority=-100 |
24 | 24 |
25 gpyfm.gui=True | 25 gpyfm.gui=True |
26 | 26 |
27 meld.gui=True | 27 meld.gui=True |
28 meld.args=--label='local' $local --label='base' $base --label='other' $other | 28 meld.args=--label='local' $local --label='base' $base --label='other' $other -o $output |
29 meld.check=changed | |
29 meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child | 30 meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child |
30 | 31 |
31 tkdiff.args=$local $other -a $base -o $output | 32 tkdiff.args=$local $other -a $base -o $output |
32 tkdiff.gui=True | 33 tkdiff.gui=True |
33 tkdiff.priority=-8 | 34 tkdiff.priority=-8 |