summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--advice.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/advice.c b/advice.c
index 486f823c78..c50ebdf5fe 100644
--- a/advice.c
+++ b/advice.c
@@ -76,16 +76,15 @@ int git_default_advice_config(const char *var, const char *value)
int error_resolve_conflict(const char *me)
{
- error("'%s' is not possible because you have unmerged files.", me);
+ error("%s is not possible because you have unmerged files.", me);
if (advice_resolve_conflict)
/*
* 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;
}