Re: No merge strategy handled the merge (git version 1.1.GIT)

Roberto Nibali [off-list ref] writes:

... "not reading code before commenting" omitted ...
On top of that "-D" did/does
not seem to be documented...

Well, initially, not documenting it was done somewhat
deliberately, because -D is an operation that would lose
information.  Running the command with -d option would reveal
its existence after telling the user why we do not let it be
deleted by default.