From 3d8b2b6d32e388ffc5929e2d54ed8ee3d5068b26 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <feedback@starbeamrainbowlabs.com>
Date: Mon, 8 May 2017 11:56:02 +0200
Subject: [PATCH] Optionally set up meld as the default merge tool if a display
 is present (ssh sessions don't have a display)

---
 envsetup | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/envsetup b/envsetup
index 6a66295..f3bed87 100755
--- a/envsetup
+++ b/envsetup
@@ -18,5 +18,11 @@ git config --global push.default simple
 ## Set the username & email address
 git config --global user.name "Starbeamrainbowlabs"
 git config --global user.email "sbrl@starbeamrainbowlabs.com"
+
+# If we've got a display, then set up meld too
+if [[ "$DISPLAY" != "" ]]; then
+	git config --global merge.tool meld
+fi
+
 ## Add gitignore.io .gitignore file generator
 git config --global alias.ignore '!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi'