Mercurial > hg

diff mercurial/merge.py @ 26651:d58f2f0e2b19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.mergedriver: don't try resolving files marked driver-resolved The driver is expected to take care of these.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 30 Sep 2015 19:43:51 -0700
parents 6ff5534c8afc
children 2b955fec91e0
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Sep 28 18:34:06 2015 -0700
+++ b/mercurial/merge.py	Wed Sep 30 19:43:51 2015 -0700
@@ -331,7 +331,7 @@
 
     def _resolve(self, preresolve, dfile, wctx, labels=None):
         """rerun merge process for file path `dfile`"""
-        if self[dfile] == 'r':
+        if self[dfile] in 'rd':
             return True, 0
         stateentry = self._state[dfile]
         state, hash, lfile, afile, anode, ofile, onode, flags = stateentry