Johannes Sixt [off-list ref] writes:
quoted
+ 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.