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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html