diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:48:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:50:44 -0700 |
| commit | 49d3536594e653717844d53825fa7c0a494888f7 (patch) | |
| tree | 35022ab151934461b2a9f21cce140b5a773369c6 /t/t3030-merge-recursive.sh | |
| parent | git-submodule - Use "get_default_remote" from git-parse-remote (diff) | |
| parent | GIT 1.6.0.1 (diff) | |
| download | tgif-49d3536594e653717844d53825fa7c0a494888f7.tar.xz | |
Merge branch 'maint' to sync with 1.6.0.1
Diffstat (limited to 't/t3030-merge-recursive.sh')
| -rwxr-xr-x | t/t3030-merge-recursive.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index aff360303a..f2880152b0 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -269,6 +269,17 @@ test_expect_success 'merge-recursive result' ' ' +test_expect_success 'fail if the index has unresolved entries' ' + + rm -fr [abcd] && + git checkout -f "$c1" && + + 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 + +' + test_expect_success 'merge-recursive remove conflict' ' rm -fr [abcd] && |