From d4fc6528408881ea03d177ca0f9df3060833bee9 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 29 May 2017 04:51:46 +0300 Subject: .gitconfig: mergetool.keepBackup = false w/ KDiff3 --- %HOME%/.gitconfig | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '%HOME%/.gitconfig') diff --git a/%HOME%/.gitconfig b/%HOME%/.gitconfig index 24c13cc..d68efc8 100644 --- a/%HOME%/.gitconfig +++ b/%HOME%/.gitconfig @@ -9,14 +9,12 @@ [merge] tool = kdiff3 [mergetool "kdiff3"] - trustExitCode = false -[mergetool] keepBackup = false + trustExitCode = false [diff] tool = kdiff3 -[difftool] - keepBackup = false [difftool "kdiff3"] + keepBackup = false trustExitCode = false [pull] ff = only -- cgit v1.2.3