diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-10 09:10:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-10 09:10:51 -0800 |
| commit | c444c16589f95ac22d8e3ffe603cd7f0613512ce (patch) | |
| tree | 31d2e0c2a77344201af6f3ee5427f47218dec9bb /t/t3030-merge-recursive.sh | |
| parent | 77f143bf3e218857ec8e5244d7e862e8e0c1a041 (diff) | |
| parent | 81b50f3ce40bfdd66e5d967bf82be001039a9a98 (diff) | |
| download | git-ly/mktree-using-strbuf.tar.gz | |
Merge "Move 'builtin-*' into a 'builtin/' subdirectory"ly/mktree-using-strbuf
Diffstat (limited to 't/t3030-merge-recursive.sh')
| -rwxr-xr-x | t/t3030-merge-recursive.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 0de613dc53..9929f82021 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -276,8 +276,13 @@ test_expect_success 'fail if the index has unresolved entries' ' test_must_fail git merge "$c5" && test_must_fail git merge "$c5" 2> out && - grep "You are in the middle of a conflicted merge" out - + grep "not possible because you have unmerged files" out && + git add -u && + test_must_fail git merge "$c5" 2> out && + grep "You have not concluded your merge" out && + rm -f .git/MERGE_HEAD && + test_must_fail git merge "$c5" 2> out && + grep "Your local changes to .* would be overwritten by merge." out ' test_expect_success 'merge-recursive remove conflict' ' |