X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge-recursive.py;h=e599b11cc57ecd0219d39fbfc8141fa5455755bf;hb=58cce8a85da745e20c9527c569a0e0935ff3ab30;hp=01292335509bfd1460e12e0e1d86c4fcd1f265a4;hpb=8fc66df237afce0b4318657f166b3583831949f3;p=git.git

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