summaryrefslogtreecommitdiff
path: root/t/t4127-apply-same-fn.sh
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2008-09-03 17:59:29 +0900
committerJunio C Hamano <gitster@pobox.com>2008-09-03 14:13:59 -0700
commit3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e (patch)
treeb7fc41aa5f6e13fd411ecb212921a72b1d0d1684 /t/t4127-apply-same-fn.sh
parent0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0 (diff)
downloadgit-3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e.tar.gz
tests: use "git xyzzy" form (t3600 - t6999)
Converts tests between t3600-t6300. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4127-apply-same-fn.sh')
-rwxr-xr-xt/t4127-apply-same-fn.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4127-apply-same-fn.sh b/t/t4127-apply-same-fn.sh
index 1f859dd908..3a8202ea93 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
'