diff options
| author |  Veres Lajos <vlajos@gmail.com> | 2013-06-19 07:37:24 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-06-19 11:31:33 -0700 |
| commit | f7e604ed390cec7b20471f9c03bbc507ebfe41c0 (patch) | |
| tree | f5bcf2eeb9d9248b307b40e5c067c33c6628a5ef /t | |
| parent | t0070 "mktemp to unwritable directory" needs SANITY (diff) | |
| download | tgif-f7e604ed390cec7b20471f9c03bbc507ebfe41c0.tar.xz | |
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')
| -rwxr-xr-x | t/t7600-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 5e19598fe7..37cc095d86 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 ' |