tmux sessions, bcomp

2016-11-15 08:56:35 -08:00
parent bebd730763
commit 99050a2e0e
2 changed files with 14 additions and 7 deletions
--- a/16
+++ b/16
@@ -1,9 +1,17 @@
 [user]
-	name = Vasili Sviridov
-	email = vasili@sviridov.ca
+    name = Vasili Sviridov
+    email = vasili@sviridov.ca

 [push]
-	default = simple
+    default = simple

 [core]
-	editor = /usr/bin/vim
+    editor = /usr/bin/vim
+[diff]
+    tool = bcomp
+[merge]
+    tool = bcomp
+
+[mergetool "bcomp"]
+    trustExitCode = true
+    cmd = bcomp \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"