Re: [PATCH 0/3] Make git more user-friendly during a merge conflict

From: Andrew Wong <andrew.kw.w@gmail.com>
Date: Mar 17, 2014, 23:25 UTC
Message-ID: <CADgNjakRSw-S4VbKnLC9PpmAcEi7iO=r0SBEy2XO3XhtDq=uJg@mail.gmail.com>
In-Reply-To: <xmqqha6wa0ln.fsf@gitster.dls.corp.google.com>

On Mon, Mar 17, 2014 at 7:04 PM, Junio C Hamano <gitster@pobox.com> wrote:

> Has this series been tested with existing test suite?  I tentatively
> queued it to 'pu' but then had to revert because many tests started
> failing, causing me to redo the today's integration cycle for 'pu'
> once again.

I tested it during RFC, but missed it when I sent it as patch. The problem is here:

@@ -1559,6 +1563,8 @@ int cmd_merge(int argc, const char **argv, const
char *prefix)
        if (merge_was_ok)
                fprintf(stderr, _("Automatic merge went well; "
                        "stopped before committing as requested\n"));
+       if (advice_merge_hints)
+               printf(_("  (use \"git merge --abort\" to abort the merge)\n"));
        else
                ret = suggest_conflicts(option_
renormalize);

I'll fix the problem. Sorry about that.