Johannes Sixt <j.sixt@xxxxxxxxxxxxx> writes: > >> + 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'.")); > > <rant> > Can people please pay attention how they break multi-line messages? In > ... > </rant> No need for ranting; please just make it so. The above is literal translation without changing the current output. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html