• J
    Fix "git-merge -s bogo" help text · 131f9a10
    Junio C Hamano 提交于
    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: NJunio C Hamano <gitster@pobox.com>
    131f9a10
builtin-merge.c 29.4 KB