bcompare

gitconfig

@@ -1,17 +1,26 @@
 [user]
-    name = Vasili Sviridov
-    email = vasili@sviridov.ca
+    name = Vasili Svirydau
+    email = vsvirydau@copperleaf.com
 
 [push]
     default = simple
 
 [core]
     editor = /usr/bin/vim
-[diff]
-    tool = bcomp
-[merge]
-    tool = bcomp
 
-[mergetool "bcomp"]
+[merge]
+    tool = bcompare
+
+[diff]
+    tool = bcompare
+
+[mergetool "bcompare"]
     trustExitCode = true
-    cmd = bcomp \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
+    cmd = bcompare "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
+
+[mergetool "meld"]
+    cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
+
+[difftool "bcompare"]
+    trustExitCode = true
+    cmd = bcompare "$LOCAL" "$REMOTE"

tmux.conf

@@ -32,4 +32,8 @@ bind _ split-window -v -c "#{pane_current_path}"# split vert
 
 bind A command-prompt "rename-window '%%'"
 
+set -g mouse on
+
+set-option -g update-environment "DISPLAY"
+
 new-session # always create a session (can always `tmux a`)