Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 22023:f18830651811

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: burn "minimal" feature to the ground Matt Mackall said: The goal of simplemerge should have always been to be a drop-in replacement for RCS merge. Please nuke this minimization thing entirely. This whole things is now dead.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 05 Aug 2014 14:56:25 -0700
parents 2ea6d906cf9b
children 5f22975d320d
line wrap: on
line diff
--- a/mercurial/filemerge.py	Tue Jul 29 11:55:01 2014 -0700
+++ b/mercurial/filemerge.py	Tue Aug 05 14:56:25 2014 -0700
@@ -191,8 +191,7 @@
                                     (tool, premerge, _valid))
 
     if premerge:
-        r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels,
-                                    no_minimal=True)
+        r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels)
         if not r:
             ui.debug(" premerge successful\n")
             return 0
@@ -219,7 +218,7 @@
 
         ui = repo.ui
 
-        r = simplemerge.simplemerge(ui, a, b, c, label=labels, no_minimal=True)
+        r = simplemerge.simplemerge(ui, a, b, c, label=labels)
         return True, r
     return False, 0