From 58cce8a85da745e20c9527c569a0e0935ff3ab30 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 30 Nov 2005 02:37:06 -0800 Subject: [PATCH] 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 --- git-merge-recursive.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 01292335..e599b11c 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.") -- 2.11.0