From 15cee80b0f179ed08fffe0b41976a2749cab363a Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 10 Apr 2017 09:20:32 +0200
Subject: Git: add "difftool" command (requires icdiff)

---
 git/.config/git/config | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'git')

diff --git a/git/.config/git/config b/git/.config/git/config
index 6228a08..ed5fc67 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -32,3 +32,9 @@
 	autosquash = true
 [rerere]
 	enabled = true
+[diff]
+  tool = icdiff
+[difftool]
+  prompt = false
+[difftool "icdiff"]
+  cmd = icdiff --line-numbers $LOCAL $REMOTE
\ No newline at end of file
-- 
cgit 1.4.1