cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

default git mergetool for cygwin changed to vimdiff

Browse source
This commit is contained in:
Cyryl Plotnicki-Chudyk 2014-02-11 13:47:27 +01:00
parent 0f624b5893
commit 48dd215550
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitconfig_includes.cygwin
View file

@ -10,7 +10,7 @@
trustExitCode = false trustExitCode = false
keepBackup = false keepBackup = false
[merge] [merge]
tool = kdiff3 tool = vimdiff
[core] [core]
autocrlf = false autocrlf = false