completion: support excluding refs

diff --git a/wt-status.c b/wt-status.c
index 617a28430449b8df19815c31f860338ec98f8c31..b96be25966c32c0e7a5d1521955a5fdf89462288 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -947,9 +947,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,