[PATCH 3 of 5 mergedriver] merge.mergedriver: don't try resolving files marked driver-resolved

[Siddharth Agarwal]

# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1443667431 25200
#      Wed Sep 30 19:43:51 2015 -0700
# Node ID 38e87fa7f8cd3cebd8af048d0149f12a8de407aa
# Parent  898f85e6b83e73b68fead89654a878d6bdffa8fb
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
@@ -318,7 +318,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