--- a/.gitconfig Fri Jun 10 16:18:26 2011 -0400
+++ b/.gitconfig Tue Jun 14 09:41:38 2011 -0400
@@ -37,3 +37,10 @@
[diff]
tool = Kaleidoscope
+
+[merge]
+tool = threesome
+
+[mergetool "threesome"]
+cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
+trustExitCode = true
--- a/.hgrc Fri Jun 10 16:18:26 2011 -0400
+++ b/.hgrc Tue Jun 14 09:41:38 2011 -0400
@@ -61,10 +61,10 @@
opts.dd =
[merge-tools]
-vimmerge.executable = mvim
-vimmerge.args = -f $output -c 'Conflict2Diff'
-vimmerge.premerge = keep
-vimmerge.priority = 1
+threesome.executable = mvim
+threesome.args = -f $base $local $other $output -c 'ThreesomeInit'
+threesome.premerge = keep
+threesome.priority = 1
[email]
method = smtp
--- a/.hgsub Fri Jun 10 16:18:26 2011 -0400
+++ b/.hgsub Tue Jun 14 09:41:38 2011 -0400
@@ -17,3 +17,4 @@
vim/bundle/command-t = [git]git://github.com/vim-scripts/Command-T.git
vim/bundle/vim-orgmode = [git]git://github.com/sjl/vim-orgmode.git
vim/bundle/slimv = [hg]http://bitbucket.org/kovisoft/slimv
+vim/bundle/threesome = [hg]http://bitbucket.org/sjl/threesome.vim
--- a/.hgsubstate Fri Jun 10 16:18:26 2011 -0400
+++ b/.hgsubstate Tue Jun 14 09:41:38 2011 -0400
@@ -2,7 +2,7 @@
b6be751b4b4391e7e25ba51e36300a8e04820846 vim/bundle/ack
bfdf714f8ea10a6bcba7a1375a5700b11077dcd9 vim/bundle/command-t
24c9f6c5974d1838a2e1db8c58bf4160298433a2 vim/bundle/easymotion
-93b8bc15d06b489433afe8c874cd36b6bbcaee8f vim/bundle/gundo
+0a6df52ad402a3ea63c06bb46ff5fa2c861fbed7 vim/bundle/gundo
1535425d6987812aa87e2123d0e509b847b893d5 vim/bundle/html5
34e28b3f6f6d702ff2963b8196eccae9344ed4bc vim/bundle/markdown
930be32a23e902ddc46135ddbb9e76b0fac0c14b vim/bundle/nerdcommenter
@@ -14,6 +14,7 @@
27710a2224d6dd0486d1c40d09ef18dd752e7d37 vim/bundle/surround
60731769663ea23b4763f3f0034da445ebcd3ddd vim/bundle/syntastic
8e2dfdcc6e13d8afab5b3f620ee06ebb29b786f9 vim/bundle/tasklist
+4995b244e11d5aaa9956bba061c32140e6af8705 vim/bundle/threesome
b9b4407a19acc4eb344cca0cc5beea75e9ff5491 vim/bundle/vim-coffee-script
c2df2e430d7d5fe645aa40e36079ab51f082e06b vim/bundle/vim-javascript
3d1692f635579e718b85dd8f24ac7fbd52a444f6 vim/bundle/vim-orgmode
--- a/vim/.vimrc Fri Jun 10 16:18:26 2011 -0400
+++ b/vim/.vimrc Tue Jun 14 09:41:38 2011 -0400
@@ -655,6 +655,28 @@
" }}}}
+" Threesome {{{
+
+let g:threesome_initial_mode = "grid"
+
+let g:threesome_initial_layout_grid = 0
+let g:threesome_initial_layout_loupe = 0
+let g:threesome_initial_layout_compare = 0
+let g:threesome_initial_layout_path = 0
+
+let g:threesome_initial_diff_grid = 0
+let g:threesome_initial_diff_loupe = 0
+let g:threesome_initial_diff_compare = 0
+let g:threesome_initial_diff_path = 0
+
+let g:threesome_initial_scrollbind_grid = 0
+let g:threesome_initial_scrollbind_loupe = 0
+let g:threesome_initial_scrollbind_compare = 0
+let g:threesome_initial_scrollbind_path = 0
+
+let g:threesome_wrap = "nowrap"
+
+" }}}
" }}}
" Synstack -------------------------------------------------------------------- {{{