Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/filemerge.py
changeset 21921 ecc1387138ba
parent 21918 10abc3a5c6b2
child 21922 50e20154cb68 
--- a/mercurial/filemerge.py	Mon Jun 09 03:49:07 2014 -0700
+++ b/mercurial/filemerge.py	Fri Jul 18 21:49:52 2014 -0500
@@ -217,7 +217,7 @@
 
         ui = repo.ui
 
-        r = simplemerge.simplemerge(ui, a, b, c, label=labels)
+        r = simplemerge.simplemerge(ui, a, b, c, label=labels, no_minimal=True)
         return True, r
     return False, 0
mercurial