Re: [RFC/PATCH] commit: make the error message on unmerged entries user-friendly.

Junio C Hamano [off-list ref] writes:

quoted

# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)

[...]

 That one line we see above is concise and does mention "rm" as
well.  Why not use it?

Fine, you convinced me. I was thinking of a longer sentence, but "/rm"
doesn't harm.

quoted

quoted

I think we should consolidate them all.

Right, although "commit" is definitely the most important (dumb users
don't need "git merge").

Your "dumb users" don't get the unmerged error from commit, either, if
they don't need "git merge".

They'd use "pull", not merge. Anyway, I did it for commit, merge,
pull, revert, cherry-pick. I guess we covered the common cases.
The patch seems to have a lot of redundancies, but I think trying to
factor this into helper functions would be much more effort than the
few cut-and-paste that I had to do, since each instance is a slight
variant of each other ...

Patch follows. Let me know in case you prefer to split it.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/