From 8b96b566d0b056033eb8b2a1b30bde32a31d54fe Mon Sep 17 00:00:00 2001
From: Cyteen <cyteen@ring-zero.co.uk>
Date: Sat, 25 Nov 2017 17:57:41 +0000
Subject: [PATCH] Set vimdiff as the merge tool.

---
 010_git-aliases.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/010_git-aliases.sh b/010_git-aliases.sh
index e78c10e..c449a8d 100644
--- a/010_git-aliases.sh
+++ b/010_git-aliases.sh
@@ -6,3 +6,8 @@ git config --global alias.lg "log --oneline --abbrev-commit --all --graph --deco
 
 # see the problems with git pull: https://stackoverflow.com/questions/15316601/in-what-cases-could-git-pull-be-harmful/15316602#15316602
 git config --global alias.up '!git remote update -p; git merge --ff-only @{u}'
+
+# set vimdiff as the merge tool.
+git config --global merge.tool vimdiff
+git config --global merge.conflictstyle diff3
+git config --global mergetool.prompt false