diff options
Diffstat (limited to 't/t1005-read-tree-m-2way-emu23.sh')
| -rwxr-xr-x | t/t1005-read-tree-m-2way-emu23.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1005-read-tree-m-2way-emu23.sh b/t/t1005-read-tree-m-2way-emu23.sh index 00c332a14..258a372ed 100755 --- a/t/t1005-read-tree-m-2way-emu23.sh +++ b/t/t1005-read-tree-m-2way-emu23.sh @@ -25,7 +25,7 @@ In the test, these paths are used: read_tree_twoway () { git-read-tree --emu23 "$1" "$2" && git-ls-files --stage && - git-merge-index ../../git-merge-one-file.sh -a && + git-merge-index git-merge-one-file -a && git-ls-files --stage } |