Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Swap file trouble with gvimdiff

From: Marco <hidden>
Date: 2016-06-15 22:50:39

Hi,

I use gvimdiff as difftool. The relevant .gitconfig entries look as follows:

[diff]
	tool = gvimdiff
[difftool]
	prompt = false

But when one diffs a file alredy opened in another window it clashes because
gvimdiff recognises the swap file and throws a message.

It would make sense to pass the option »-n« to gvimdiff to avoid creating a
swap file, since it is not needed here.

I haven't found the place where the command line and arguments for the
supported difftools are placed, so I created a new entry in the .gitconfig

[diff]
	tool = bettergvimdiff
[difftool "bettergvimdiff"]
	cmd = "gvimdiff -f -n \"$LOCAL\" \"$REMOTE\""

I want to know if this is a »correct« solution and — if not — how you solve
the problem.


Marco
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help