diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-19 17:42:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-19 17:42:57 (GMT) |
| commit | e6d6911941fb0d078453a44ec840af57e6578676 (patch) | |
| tree | bb8a8b4f865f731dfe4fff87a6b46e09aec55699 /t | |
| parent | 0b57758c351dd1e69f405bf4c111e1ea93f1da69 (diff) | |
| parent | f7e604ed390cec7b20471f9c03bbc507ebfe41c0 (diff) | |
| download | git-e6d6911941fb0d078453a44ec840af57e6578676.zip git-e6d6911941fb0d078453a44ec840af57e6578676.tar.gz git-e6d6911941fb0d078453a44ec840af57e6578676.tar.bz2 | |
Merge branch 'vl/typofix' into maint
* vl/typofix:
random typofixes (committed missing a 't', successful missing an 's')
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 2f70433..460d8eb 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 ' |