From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Feb 2011 20:01:15 GMT
Subject: Re: [PATCH] mergetool-lib: call vim in readonly mode for diffs
Message-ID: <7v62s7anp0.fsf@alter.siamese.dyndns.org>
In-Reply-To: <227c6e4e11ce964a6e6898afb422d424d46a7b50.1298626494.git.git@drmicha.warpmail.net>

Michael J Gruber <git@drmicha.warpmail.net> writes:

> When [g]vimdiff is called for files which are opened already, the editor
> complains about the existing swap file. But we do not want to write
> anything when called from difftool. So, make difftool use "-R" for the
> vim family.

Makes sense.  Maint-worthy?

Will queue, thanks.