diff options
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index e576a7fdc6..8e8e1362a0 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -802,6 +802,8 @@ static void abort_commit(struct commit_list *remoteheads, const char *err_msg) error("%s", err_msg); fprintf(stderr, _("Not committing merge; use 'git commit' to complete the merge.\n")); + if (advice_merge_hints) + printf(_(" (use \"git merge --abort\" to abort the merge)\n")); write_merge_state(remoteheads); exit(1); } @@ -910,6 +912,8 @@ static int suggest_conflicts(int renormalizing) rerere(allow_rerere_auto); printf(_("Automatic merge failed; " "fix conflicts and then commit the result.\n")); + if (advice_merge_hints) + printf(_(" (use \"git merge --abort\" to abort the merge)\n")); return 1; } @@ -1556,6 +1560,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); |