diff --git a/builtin/revert.c b/builtin/revert.c
index 028bcbcd75d21ada2bc0406ff74e3073014bb41f..00df5266d574ea1f8c9ab745ed606bac566392b5 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
return;
}
return;
}
- if (show_hint) {
- advise("after resolving the conflicts, mark the corrected paths");
- advise("with 'git add <paths>' or 'git rm <paths>'");
- advise("and commit the result with 'git commit'");
- }
+ if (show_hint)
+ advise(_("after resolving the conflicts, mark the corrected paths\n"
+ "with 'git add <paths>' or 'git rm <paths>'\n"
+ "and commit the result with 'git commit'"));
}
static void write_message(struct strbuf *msgbuf, const char *filename)
}
static void write_message(struct strbuf *msgbuf, const char *filename)