summaryrefslogtreecommitdiff
path: root/t/t4109
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2011-02-25 10:36:39 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-25 12:00:28 -0800
commit853c0ffe42fef0bd1abd5cc69d5e93fdd5a708aa (patch)
tree642ce419edc2156230be962f95aea9c7e49daf3e /t/t4109
parentGit 1.7.4 (diff)
downloadtgif-853c0ffe42fef0bd1abd5cc69d5e93fdd5a708aa.tar.xz
mergetool-lib: call vim in readonly mode for diffs
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. This - prevents the use of a swap file and - marks the buffers readonly. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4109')
0 files changed, 0 insertions, 0 deletions