aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuangxiong Lin <[email protected]>2021-09-16 23:08:33 +0800
committerGuangxiong Lin <[email protected]>2021-09-16 23:08:33 +0800
commite241d28de0a3f85f5e8f493dc6d41747a97f799f (patch)
treeb7a5e046f6145339ba4b44c022e05b76b15cf1f3
parent7ecbfb283fd4935a545abc024b478143aab1a1fe (diff)
downloaddotfiles-e241d28de0a3f85f5e8f493dc6d41747a97f799f.tar.gz
dotfiles-e241d28de0a3f85f5e8f493dc6d41747a97f799f.tar.bz2
dotfiles-e241d28de0a3f85f5e8f493dc6d41747a97f799f.zip
Use vimdiff as merge tool
-rw-r--r--.gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index b882e2d..1455c11 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -8,3 +8,5 @@
gpgsign = true
[gpg]
program = gpg
+[merge]
+ tool = vimdiff