summaryrefslogtreecommitdiff
path: root/advice.c
diff options
context:
space:
mode:
Diffstat (limited to 'advice.c')
-rw-r--r--advice.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/advice.c b/advice.c
index 9b42033..3b8bf3c 100644
--- a/advice.c
+++ b/advice.c
@@ -86,8 +86,7 @@ int error_resolve_conflict(const char *me)
* other commands doing a merge do.
*/
advise(_("Fix them up in the work tree, and then use 'git add/rm <file>'\n"
- "as appropriate to mark resolution and make a commit, or use\n"
- "'git commit -a'."));
+ "as appropriate to mark resolution and make a commit."));
return -1;
}