Jeff King [off-list ref] writes:
Your local changes to '%s' would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.
What version of git are you using? If you (or others you are helping)
saw that message and it wasn't helpful, do you have any suggestions for
how to improve it?
I use 1.7.1-rc0 myself, but dropping comma after "Please" may make it a
bit easier to read IMHO ;-).