| commit | 131f9a108bba5a8b0bcba072696653ab3199911a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Aug 2008 05:07:55 +0000 (20 22:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Aug 2008 05:57:55 +0000 (20 22:57 -0700) | ||
| tree | 03d21803780a8271a546fa3d64a8345bb9ff1da0 | treesnapshot (tar.gz zip) |
| parent | 13613eac5bf886b37cc583462999419f91c98a17 | commitdiff |
Fix "git-merge -s bogo" help text
It does not make much sense to reuse the output code from "git help" to
show the list of commands to the standard output while giving the error
message before that to the standard error stream. This makes the output
consistent to that of the 1.6.0 version of "git merge".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
It does not make much sense to reuse the output code from "git help" to
show the list of commands to the standard output while giving the error
message before that to the standard error stream. This makes the output
consistent to that of the 1.6.0 version of "git merge".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-merge.c | diffblobblamehistory |