summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-30 10:37:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-30 10:37:06 (GMT)
commit58cce8a85da745e20c9527c569a0e0935ff3ab30 (patch)
treeaa034aa4715069a0e3abe08628bc4393eaa34a61 /git-merge-recursive.py
parent15bf57a18aaf10c038e2026dfe54281edbb6080a (diff)
downloadgit-58cce8a85da745e20c9527c569a0e0935ff3ab30.zip
git-58cce8a85da745e20c9527c569a0e0935ff3ab30.tar.gz
git-58cce8a85da745e20c9527c569a0e0935ff3ab30.tar.bz2
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>
Diffstat (limited to 'git-merge-recursive.py')
-rwxr-xr-xgit-merge-recursive.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 0129233..e599b11 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.")