Merge branch 'mm/status-suggest-merge-abort'

diff --git a/wt-status.c b/wt-status.c
index 19cbc3939cdb3d6a84c0dbd88a4e43847d228363..3175ec6ddb6d6e40f8e2cfcbbb0b4acf5f0b5e98 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -948,9 +948,12 @@ static void show_merge_in_progress(struct wt_status *s,
 {
        if (has_unmerged(s)) {
                status_printf_ln(s, color, _("You have unmerged paths."));
-               if (s->hints)
+               if (s->hints) {
                        status_printf_ln(s, color,
-                               _("  (fix conflicts and run \"git commit\")"));
+                                        _("  (fix conflicts and run \"git commit\")"));
+                       status_printf_ln(s, color,
+                                        _("  (use \"git merge --abort\" to abort the merge)"));
+               }
        } else {
                s-> commitable = 1;
                status_printf_ln(s, color,