X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=t%2Ft1005-read-tree-m-2way-emu23.sh;h=258a372ed717a1250473364c7be9c7920062bd0e;hb=1f8af483df5ea7070c421489eff40ca8e508b778;hp=00c332a1407a86096cbaf06ef5d8ec613a412190;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git diff --git a/t/t1005-read-tree-m-2way-emu23.sh b/t/t1005-read-tree-m-2way-emu23.sh index 00c332a1..258a372e 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 }