diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2011-09-21 09:48:36 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-09-21 15:05:53 -0700 |
| commit | 6f90969ba88ab862806e58abc6b7047afbc64d27 (patch) | |
| tree | e965256a0bab32edec74558059374926d11562e3 /t/t7607-merge-overwrite.sh | |
| parent | Git 1.7.6 (diff) | |
| download | tgif-6f90969ba88ab862806e58abc6b7047afbc64d27.tar.xz | |
unpack-trees: print "Aborting" to stderr
display_error_msgs() prints all the errors to stderr already (if any),
followed by "Aborting" (if any) to stdout. Make the latter go to stderr
instead.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7607-merge-overwrite.sh')
| -rwxr-xr-x | t/t7607-merge-overwrite.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index 72a8731d5e..aa74184c31 100755 --- a/t/t7607-merge-overwrite.sh +++ b/t/t7607-merge-overwrite.sh @@ -107,6 +107,7 @@ error: The following untracked working tree files would be overwritten by merge: sub sub2 Please move or remove them before you can merge. +Aborting EOF test_expect_success 'will not overwrite untracked file in leading path' ' |