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'