# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1537384072 25200
# Node ID f803bcb902ad8d4c14cc8e9a7e437c22ea5dc413
# Parent  38d51371792b27c180c2aa389d43976282dc1f7e
meld: enable auto-merge

This tells meld to resolve trivial conflicts before presenting the
user with the remaining conflicts.

This was attempted 5 years ago, but then --auto-merge was too new that
the patch was rejected out of concern that users still had an older
version of meld installed [1]. Maybe it's safe to assume that they
have a newer version now.


 [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2013-April/050084.html

Differential Revision: https://phab.mercurial-scm.org/D4665

diff -r 38d51371792b -r f803bcb902ad mercurial/default.d/mergetools.rc
--- a/mercurial/default.d/mergetools.rc	Thu Sep 20 23:45:30 2018 -0400
+++ b/mercurial/default.d/mergetools.rc	Wed Sep 19 12:07:52 2018 -0700
@@ -26,7 +26,7 @@
 gpyfm.gui=True
 
 meld.gui=True
-meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output
+meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output --auto-merge
 meld.check=changed
 meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child