Jeff King [off-list ref] writes:
On Sat, Dec 12, 2009 at 01:02:02AM -0800, Junio C Hamano wrote:
quoted
When the desired resolution is to remove the path, "git rm <path>" is the
command the user needs to use. Just like in "Changed but not updated"
section, suggest to use "git add/rm" as appropriate.
I no longer even see these messages due to advice.statushints, but the
overall direction of the series looks sane to me.
However:
quoted
- color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to mark resolution)");
+ color_fprintf_ln(s->fp, c, "# (use \"git add/rm <file>...\" as appropriately to mark resolution)");
This should be "as appropriate".
Heh, I kant speel. Fixed and re-pushed out on 'pu'.
Thanks.