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

We already suggest 'git rebase --abort' during a conflicted rebase.
Similarly, suggest 'git merge --abort' during conflict resolution on
'git merge'.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 44bf1d84af574509c5a8f6f05721d7c4f9719439..4d17363a926c8938c6c8d78e997a53ffb81b3c6c 100755 (executable)
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -34,6 +34,7 @@ test_expect_success 'M/D conflict does not segfault' '
 On branch side
 You have unmerged paths.
   (fix conflicts and run "git commit")
 On branch side
 You have unmerged paths.
   (fix conflicts and run "git commit")

+  (use "git merge --abort" to abort the merge)

 
 Unmerged paths:
   (use "git add/rm <file>..." as appropriate to mark resolution)
 
 Unmerged paths:
   (use "git add/rm <file>..." as appropriate to mark resolution)


@@ -138,6 +139,7 @@ test_expect_success 'status when conflicts with add and rm advice (deleted by th
 On branch master
 You have unmerged paths.
   (fix conflicts and run "git commit")
 On branch master
 You have unmerged paths.
   (fix conflicts and run "git commit")

+  (use "git merge --abort" to abort the merge)

 
 Unmerged paths:
   (use "git add/rm <file>..." as appropriate to mark resolution)
 
 Unmerged paths:
   (use "git add/rm <file>..." as appropriate to mark resolution)


@@ -171,6 +173,7 @@ test_expect_success 'status when conflicts with add and rm advice (both deleted)
 On branch conflict_second
 You have unmerged paths.
   (fix conflicts and run "git commit")
 On branch conflict_second
 You have unmerged paths.
   (fix conflicts and run "git commit")

+  (use "git merge --abort" to abort the merge)

 
 Unmerged paths:
   (use "git add/rm <file>..." as appropriate to mark resolution)
 
 Unmerged paths:
   (use "git add/rm <file>..." as appropriate to mark resolution)


@@ -195,6 +198,7 @@ test_expect_success 'status when conflicts with only rm advice (both deleted)' '
 On branch conflict_second
 You have unmerged paths.
   (fix conflicts and run "git commit")
 On branch conflict_second
 You have unmerged paths.
   (fix conflicts and run "git commit")

+  (use "git merge --abort" to abort the merge)

 
 Changes to be committed:
 
 
 Changes to be committed:
 

diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 49d19a3b36d0649dfd01de29acdbf0fab2532e17..5c3db656dfaa0171598445720b62e63f13f67f44 100755 (executable)
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -29,6 +29,7 @@ test_expect_success 'status when conflicts unresolved' '
 On branch conflicts
 You have unmerged paths.
   (fix conflicts and run "git commit")
 On branch conflicts
 You have unmerged paths.
   (fix conflicts and run "git commit")

+  (use "git merge --abort" to abort the merge)

 
 Unmerged paths:
   (use "git add <file>..." to mark resolution)
 
 Unmerged paths:
   (use "git add <file>..." to mark resolution)

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 (has_unmerged(s)) {
                status_printf_ln(s, color, _("You have unmerged paths."));

-               if (s->hints)
+               if (s->hints) {

                        status_printf_ln(s, color,
                        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."));
        } else {
                status_printf_ln(s, color,
                        _("All conflicts fixed but you are still merging."));