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/merge.py
changeset 30161 339f9d93daa6
parent 30096 98d3d8108db0
child 30162 5cb830801855 
--- a/mercurial/merge.py	Wed Oct 12 12:22:18 2016 +0200
+++ b/mercurial/merge.py	Wed Oct 12 12:22:18 2016 +0200
@@ -475,7 +475,7 @@
         flo = fco.flags()
         fla = fca.flags()
         if 'x' in flags + flo + fla and 'l' not in flags + flo + fla:
-            if fca.node() == nullid:
+            if fca.node() == nullid and flags != flo:
                 if preresolve:
                     self._repo.ui.warn(
                         _('warning: cannot merge flags for %s\n') % afile)
mercurial