From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Apr 2013 03:31:52 GMT
Subject: Re: [ANNOUNCE] Git v1.8.3-rc0
Message-ID: <7vzjwinhav.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130427091833.GB472@serenity.lan>

John Keeping <john@keeping.me.uk> writes:

> On Fri, Apr 26, 2013 at 05:22:22PM -0700, Junio C Hamano wrote:
>>  * "git difftool" allows the user to write into the temporary files
>>    being shown; if the user makes changes to the working tree at the
>>    same time, one of the changes has to be lost in such a case, but it
>>    tells the user what happened and refrains from overwriting the copy
>>    in the working tree.
>
> This feels slightly misleading to me, perhaps something like this would
> be clearer?
>
>    "git difftool" allows the user to write into the temporary files
>    being shown; if the user makes changes to the working tree at the
>    same time, it now refrains from overwriting the copy in the working
>    tree and leaves the temporary file so that changes can be merged
>    manually.

Probably.  I'll keep the above in my stash and roll it in by -rc1.

Thanks.