Set up merge tool and improve diffs

* Use vimdiff2 for git mergetool
* Use patience diff algorithm for diff and merge

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