# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-10-01 02:43:51
# Node ID d58f2f0e2b1915d52dda5b007b352be8db721116
# Parent  6ff5534c8afcf28a9e8f89e89b90c80cf1486236

merge.mergedriver: don't try resolving files marked driver-resolved

The driver is expected to take care of these.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -331,7 +331,7 @@ class mergestate(object):
 
     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