D4665: meld: enable auto-merge

[martinvonz (Martin von Zweigbergk)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf803bcb902ad: meld: enable auto-merge (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4665?vs=11199&id=11255

REVISION DETAIL
  https://phab.mercurial-scm.org/D4665

AFFECTED FILES
  mercurial/default.d/mergetools.rc

CHANGE DETAILS

diff --git a/mercurial/default.d/mergetools.rc b/mercurial/default.d/mergetools.rc
--- a/mercurial/default.d/mergetools.rc
+++ b/mercurial/default.d/mergetools.rc
@@ -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
 



To: martinvonz, #hg-reviewers, av6
Cc: mercurial-devel