summaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 936df37..08e0b33 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,3 +7,5 @@
[core]
excludesfile = ~/.gitignore
autocrlf = input
+[merge]
+ tool = vimdiff

Contact - Imprint