diff options
| -rwxr-xr-x | git-merge-recursive.py | 2 |
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.") |