diff options
Diffstat (limited to 'advice.c')
-rw-r--r-- | advice.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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; } |