Re: [RFC 2/3] merge: Add hints to tell users about "git merge --abort"

On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder [off-list ref] wrote:

Andrew Wong wrote:

quoted

--- a/builtin/merge.c
+++ b/builtin/merge.c

@@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
      fclose(fp);
      rerere(allow_rerere_auto);
      printf(_("Automatic merge failed; "
-                     "fix conflicts and then commit the result.\n"));
+                     "fix conflicts and then commit the result.\n"
+                     "To abort the merge, use \"git merge --abort\".\n"));

Seems reasonable, but I worry about the command growing too noisy.

Could this be guarded by an advice.<something> setting?  (See advice.*
in git-config(1) for what I mean.)

I was planning to use advice.resolveConflict, but as I went through
merge.c, I noticed there could be a few other situations where we
could print out the same message:
1. when prepare_to_commit() fails, due to hook error, editor error, or
empty commit message
2. "git commit --no-commit"

This means contexts are no longer only about "resolving conflict", so
I was thinking of renaming advice.resolveConflict to something like
advice.mergeHints.

Any thoughts?