From: Jeff King <peff@peff.net>
Date: Tue, 08 Sep 2009 07:51:56 GMT
Subject: Re: Improving merge failure message
Message-ID: <20090908075156.GA19294@coredump.intra.peff.net>
In-Reply-To: <7vk509ev20.fsf@alter.siamese.dyndns.org>

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