Make vimdiff the default Git mergetool

2024-10-26 17:02:38 +01:00 · 2024-10-26 17:02:38 +01:00 · c81060660c
parent eb4ec29abc
commit c81060660c
1 changed files with 2 additions and 0 deletions
--- a/git/.gitconfig
+++ b/git/.gitconfig
@ -3,3 +3,5 @@
 [user]
 	name = The Magician
 	email = themagician@engineer.com
+[merge]
+	tool = vimdiff