Re: Improving merge failure message

On Tue, Sep 08, 2009 at 12:48:23AM -0700, Junio C Hamano wrote:

Thanks, very true indeed.  "It would be clobbered if we were to continue
hence we abort." is how we want to explain our behaviour, so "would" is
definitely better here.

While we're picking apart your wording, is "clobbered" the word we want
to use? Everywhere else that is user-facing we tend to use the term
"overwritten".

-Peff