summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorVeres Lajos <vlajos@gmail.com>2013-06-19 05:37:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-19 18:31:33 (GMT)
commitf7e604ed390cec7b20471f9c03bbc507ebfe41c0 (patch)
treef5bcf2eeb9d9248b307b40e5c067c33c6628a5ef /t/t7600-merge.sh
parentb3b8ceb48b7d75631a8638f1dc6ccdf7f1b53888 (diff)
downloadgit-f7e604ed390cec7b20471f9c03bbc507ebfe41c0.zip
git-f7e604ed390cec7b20471f9c03bbc507ebfe41c0.tar.gz
git-f7e604ed390cec7b20471f9c03bbc507ebfe41c0.tar.bz2
random typofixes (committed missing a 't', successful missing an 's')
Signed-off-by: Veres Lajos <vlajos@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 5e19598..37cc095 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -316,7 +316,7 @@ test_expect_success 'merge c1 with c2 (squash)' '
test_debug 'git log --graph --decorate --oneline --all'
-test_expect_success 'unsuccesful merge of c1 with c2 (squash, ff-only)' '
+test_expect_success 'unsuccessful merge of c1 with c2 (squash, ff-only)' '
git reset --hard c1 &&
test_must_fail git merge --squash --ff-only c2
'