From 347b263fd6ac85ee2362d61134c7e169e5d488e2 Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <benie@infektor.net>
Date: Thu, 2 Jul 2020 15:56:12 +0100
Subject: [PATCH] Set up merge tool and improve diffs

* Use vimdiff2 for git mergetool
* Use patience diff algorithm for diff and merge
---
 config | 7 +++++++
 1 file changed, 7 insertions(+)

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