John Keeping <j...@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
Probably. I'll keep the above in my stash and roll it in by -rc1.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html