status: suggest 'git merge --abort' when appropriate

diff --git a/wt-status.c b/wt-status.c
index ced53dd1d49eb641f5505a8a75502e95de356c3c..f6f112b48cc1d7a7ca60d0712f0cd830614071e9 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -946,9 +946,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 {
                status_printf_ln(s, color,
                        _("All conflicts fixed but you are still merging."));