Signed-off-by: Andrew Wong <[email protected]>
---
builtin/merge.c | 3 ++-
wt-status.c | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index e576a7f..07af427 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
fclose(fp);
rerere(allow_rerere_auto);
printf(_("Automatic merge failed; "
- "fix conflicts and then commit the result.\n"));
+ "fix conflicts and then commit the result.\n"
+ "To abort the merge, use \"git merge --abort\".\n"));
return 1;
}
diff --git a/wt-status.c b/wt-status.c
index 6e1ad7d..54c2203 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -907,6 +907,9 @@ static void show_merge_in_progress(struct wt_status *s,
status_printf_ln(s, color,
_(" (use \"git commit\" to conclude merge)"));
}
+ if (s->hints)
+ status_printf_ln(s, color,
+ _(" (use \"git merge --abort\" to abort the
merge)\n"));
wt_status_print_trailer(s);
}
--
1.9.0.6.g16e5f9a
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
