@@ -25,9 +25,11 @@
changed = bold red
untracked = bold yellow
+[merge]
+ tool = vimdiff
+
# git.debian.org specifics
[url "git://anonscm.debian.org"]
insteadOf = "git://git.debian.org"
[url "ssh://git.debian.org"]
pushInsteadOf = "git://git.debian.org"
-
