mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-21 16:47:27 +02:00
Code

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-11-30 02:37:06 -08:00
parent 15bf57a18a
commit 58cce8a85d
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge-recursive.py
View File

@ -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.")