diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-22 06:26:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-22 06:26:46 (GMT) |
| commit | 2eb54692d145a0c2939698302e913975f059ac34 (patch) | |
| tree | 88911c7cd362f52770bded7c03b73f32a7d8abb7 /t/t3400-rebase.sh | |
| parent | a0b6a9d2b2b0667bc170c864a05b3ec4635a71bb (diff) | |
| parent | e935e62a0fd26ff1f29a98a4ca8fa693f42357a2 (diff) | |
| download | git-2eb54692d145a0c2939698302e913975f059ac34.zip git-2eb54692d145a0c2939698302e913975f059ac34.tar.gz git-2eb54692d145a0c2939698302e913975f059ac34.tar.bz2 | |
Merge branch 'dg/local-mod-error-messages'
* dg/local-mod-error-messages:
t7609: test merge and checkout error messages
unpack_trees: group error messages by type
merge-recursive: distinguish "removed" and "overwritten" messages
merge-recursive: porcelain messages for checkout
Turn unpack_trees_options.msgs into an array + enum
Conflicts:
t/t3400-rebase.sh
Diffstat (limited to 't/t3400-rebase.sh')
| -rwxr-xr-x | t/t3400-rebase.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index a19aeb6..349eebd 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -153,7 +153,8 @@ test_expect_success 'setup: recover' ' test_expect_success 'Show verbose error when HEAD could not be detached' ' >B && test_must_fail git rebase topic 2>output.err >output.out && - grep "Untracked working tree file .B. would be overwritten" output.err + grep "The following untracked working tree files would be overwritten by checkout:" output.err && + grep B output.err ' rm -f B |