diff options
Diffstat (limited to 'advice.c')
| -rw-r--r-- | advice.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -84,10 +84,9 @@ int error_resolve_conflict(const char *me) * Message used both when 'git commit' fails and when * other commands doing a merge do. */ - advise(_("Fix them up in the work tree,\n" - "and then use 'git add/rm <file>' as\n" - "appropriate to mark resolution and make a commit,\n" - "or use 'git commit -a'.")); + 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'.")); return -1; } |