diff --git a/config b/config
index 40f921b..1ef123d 100644
--- a/config
+++ b/config
@@ -61,9 +61,16 @@
 
 [diff]
 	tool = vimdiff
+	algorithm = patience
 [difftool]
 	prompt = false
 
+[merge]
+	tool = vimdiff2
+	algorithm = patience
+[mergetool]
+	prompt = false
+
 [include]
 	path = ~/.config/private/gitconfig
 	path = ~/.config/work/gitconfig