Set up merge tool and improve diffs

* Use vimdiff2 for git mergetool * Use patience diff algorithm for diff and merge
2020-07-02 15:56:12 +01:00 · 2020-07-02 15:56:12 +01:00 · 347b263fd6
commit 347b263fd6
parent 9d77e3e058
1 changed files with 7 additions and 0 deletions
--- a/7
+++ b/7
@ -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