From 8430953d9ce58ea165726c94f369251b956eb71c Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Sat, 19 Nov 2016 19:07:49 +1100 Subject: [PATCH] Enable kdiff3 by default and allow OS-specific packages to override --- config/git/config | 3 +++ config/git/tools/kdiff3 | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 config/git/tools/kdiff3 diff --git a/config/git/config b/config/git/config index fa9a2a0..be1b8fc 100644 --- a/config/git/config +++ b/config/git/config @@ -1,4 +1,7 @@ +# vim: ft=gitconfig [include] + path = tools/kdiff3 + path = config.os path = config.local [user] diff --git a/config/git/tools/kdiff3 b/config/git/tools/kdiff3 new file mode 100644 index 0000000..8e39c17 --- /dev/null +++ b/config/git/tools/kdiff3 @@ -0,0 +1,5 @@ +# vim: ft=gitconfig +[merge] + tool = kdiff3 +[diff] + tool = kdiff3