X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4127-apply-same-fn.sh;h=3a8202ea9311b1c90158ad0d115dda985060fdeb;hb=c06951894ac943b2aaa288b0e9dc1eb605dfb7b6;hp=1f859dd908cb298bf89a13822e8fc19882060689;hpb=7e4ad908721445b073f3b4ecad55bbd78f032cdc;p=git.git diff --git a/t/t4127-apply-same-fn.sh b/t/t4127-apply-same-fn.sh index 1f859dd90..3a8202ea9 100755 --- a/t/t4127-apply-same-fn.sh +++ b/t/t4127-apply-same-fn.sh @@ -26,7 +26,7 @@ test_expect_success 'apply same filename with independent changes' ' git diff >> patch0 && cp same_fn same_fn2 && git reset --hard && - git-apply patch0 && + git apply patch0 && diff same_fn same_fn2 ' @@ -39,7 +39,7 @@ test_expect_success 'apply same filename with overlapping changes' ' git diff >> patch0 && cp same_fn same_fn2 && git reset --hard && - git-apply patch0 && + git apply patch0 && diff same_fn same_fn2 '