Mergetool set to vimdiff

9 years ago · f7f7a7e1d2
1 changed files with 3 additions and 0 deletions
--- a/3
+++ b/3
@ -8,6 +8,9 @@
    ui = auto
 [push]
    default = current
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
 [alias]
    # Basics
    st = status -s