1 files changed, 11 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 2a0b2e3..e5dfcf0 100644
--- a/gitconfig
+++ b/gitconfig
@@ -15,9 +15,20 @@
     editor = vim
     autocrlf = input
     excludesfile = /Users/matt/.gitignore
+    pager = less -+$LESS -RSX
 
 [push]
     default = nothing
 
 [color]
     ui = true
+
+[mergetool]
+    keepTemporaries = false
+    prompt = false
+
+[merge]
+    tool = meld
+
+[diff]
+    tool = meld