[PATCH] Fix meld.args in mergetools.rc: add -o $output

Völker Ronny ronny.voelker at elaxy.de
Thu Feb 21 08:04:43 CST 2013

# HG changeset patch
# User Ronny Voelker <ronny.voelker at gmail.com>
# Date 1361454565 -3600
# Node ID 138968bb44d36a06393ecb82c74490914f7598bc
# Parent  4921b5c2aeed8a6bb0918503f7802508538f01e5
Fix meld.args in mergetools.rc: add -o $output

Without this argument meld saves the result of a merge in $base.
This is a temporary file, which is ignored by Mercurial.
So the result of the merge is lost.

diff -r 4921b5c2aeed -r 138968bb44d3 contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc   Sun Feb 17 14:34:53 2013 -0600
+++ b/contrib/mergetools.hgrc               Thu Feb 21 14:49:25 2013 +0100
@@ -25,7 +25,7 @@
-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.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
 tkdiff.args=$local $other -a $base -o $output
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130221/def6e699/attachment.html>

More information about the Mercurial-devel mailing list