merge-recursive: match the unmerged index entry behaviour with merge-resolve

This minimally changes merge-recursive to match what happens
when O->A, O->B, A!=B 3-way filelevel merge leaves conflicts to
the new merge-resolve behaviour.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 01292335509bfd1460e12e0e1d86c4fcd1f265a4..e599b11cc57ecd0219d39fbfc8141fa5455755bf 100755 (executable)
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -828,8 +828,6 @@ def processEntry(entry, branch1Name, branch2Name):
             if cacheOnly:
                 updateFile(False, sha, mode, path)
             else:
             if cacheOnly:
                 updateFile(False, sha, mode, path)
             else:

-                updateFileExt(aSha, aMode, path,
-                              updateCache=True, updateWd=False)

                 updateFileExt(sha, mode, path, updateCache=False, updateWd=True)
     else:
         die("ERROR: Fatal merge failure, shouldn't happen.")
                 updateFileExt(sha, mode, path, updateCache=False, updateWd=True)
     else:
         die("ERROR: Fatal merge failure, shouldn't happen.")