X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-recursive.py;h=b7fb0961e0758c566c459f51b6983f99e694ee4f;hb=5e80092f7e6db09a40a62e837ca3f74f0bc5ad73;hp=e599b11cc57ecd0219d39fbfc8141fa5455755bf;hpb=5401f3040b61e11da79d676e42aacfa9f1131083;p=git.git

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index e599b11c..b7fb0961 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -98,7 +98,7 @@ getFilesRE = re.compile(r'^([0-7]+) (\S+) ([0-9a-f]{40})\t(.*)$', re.S)
 def getFilesAndDirs(tree):
     files = Set()
     dirs = Set()
-    out = runProgram(['git-ls-tree', '-r', '-z', tree])
+    out = runProgram(['git-ls-tree', '-r', '-z', '-t', tree])
     for l in out.split('\0'):
         m = getFilesRE.match(l)
         if m: