diff options
| -rwxr-xr-x | git-merge-recursive.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py index e599b11cc..b7fb0961e 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: |