Re: [ANNOUNCE] Git v1.8.3-rc0

From: John Keeping <john@keeping.me.uk>
Date: Apr 27, 2013, 09:18 UTC
Message-ID: <20130427091833.GB472@serenity.lan>
In-Reply-To: <7vvc78u8jl.fsf@alter.siamese.dyndns.org>

On Fri, Apr 26, 2013 at 05:22:22PM -0700, Junio C Hamano wrote:

Show 5 quoted lines

>  * "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.