From b7eafd6b952466fe19b198b461f3e98b543dcba9 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Wed, 13 Jan 2021 11:28:57 +0100
Subject: Use kdiff3 for git, set default branch to main

---
 bin/git_diff | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/git_diff b/bin/git_diff
index 6193650..8b6d242 100755
--- a/bin/git_diff
+++ b/bin/git_diff
@@ -4,7 +4,7 @@
 # From https://stackoverflow.com/a/7669988/3805440, thanks
 
 # side-by-side diff with custom options:
-# /usr/bin/sdiff -w200 -l "$2" "$5" 
+#/usr/bin/sdiff -w200 -l "$2" "$5" 
 
 # using kdiff3 as the side-by-side diff:
 /usr/bin/kdiff3 "$2" "$5"
@@ -13,5 +13,4 @@
 #/usr/bin/meld "$2" "$5"
 
 # using VIM
-#/usr/bin/vimdiff "$2" "$5"
-
+#/usr/bin/nvim -d "$2" "$5"
-- 
cgit v1.2.1