From: Junio C Hamano <junkio@cox.net>
Date: Wed, 30 Nov 2005 10:37:06 +0000 (-0800)
Subject: merge-recursive: match the unmerged index entry behaviour with merge-resolve
X-Git-Tag: v0.99.9l^2~24^5~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=58cce8a85da745e20c9527c569a0e0935ff3ab30;p=git.git

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 012923355..e599b11cc 100755
--- 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:
-                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.")