@matheusbsbs / matheus-bagliano / commits / 58cce8a85d
Fork 0

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>

Junio C Hamano committed Nov 30, 2005 at 02:37 UTC 58cce8a85da745e20c9527c569a0e0935ff3ab30
1 file changed -2
git-merge-recursive.py
-2
@@ -828,8 +828,6 @@ def processEntry(entry, branch1Name, branch2Name):
828 if cacheOnly:
829 updateFile(False, sha, mode, path)
830 else:
831 - updateFileExt(aSha, aMode, path,
832 - updateCache=True, updateWd=False)
831 updateFileExt(sha, mode, path, updateCache=False, updateWd=True)
832 else:
833 die("ERROR: Fatal merge failure, shouldn't happen.")