# HG changeset patch # User Steve Losh # Date 1334067568 14400 # Node ID e6ee416c6eaa6870755e3334f1db3e8b00b127dd # Parent e65beb74d9d9fbd3f4781c8ff7096375e683702a threesome.vim: Update site. diff -r e65beb74d9d9 -r e6ee416c6eaa threesome.vim/index.html --- a/threesome.vim/index.html Tue Apr 10 10:18:12 2012 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,126 +0,0 @@ - - - - - - - - - - - Threesome - a Vim plugin for resolving three-way merges- - - - - - - - - - - - - - - - - - - - -
-
-

threesome

- -

- Threesome is a Vim plugin for resolving conflicts during three-way merges. -

- -

- It's designed to be used as a merge tool for version control systems like - Mercurial and Git. -

- - -
- -
-

Demo

-

Watch the demo screencast in HD on Vimeo.

-

Requirements

-

Vim 7.3+ compiled with Python 2.5+ support.

-

Yes, that's some (relatively) new stuff. No, I'm not going to support anything less -than that.

-

Threesome is a merge tool which means you'll be working with it on your development -machine, not over SSH on your servers.

-

If you can't be bothered to run up-to-date versions of your tools on your main -development machine, I can't be bothered to clutter the codebase to support you. -Feels bad, man.

-

Installation

-

Use Pathogen to install the plugin from your choice of repositories:

-
hg clone https://bitbucket.org/sjl/threesome.vim ~/.vim/bundle/threesome
-git clone https://github.com/sjl/threesome.vim.git ~/.vim/bundle/threesome
-
-

Build the docs:

-
:call pathogen#helptags()
-
-

Add it as a merge tool for your VCS of choice.

-

Mercurial

-

Add the following lines to ~/.hgrc:

-
[merge-tools]
-threesome.executable = mvim
-threesome.args = -f $base $local $other $output -c 'ThreesomeInit'
-threesome.premerge = keep
-threesome.priority = 1
-
-

Note: replace mvim with gvim if you're on Linux, or just plain vim if you prefer to keep the editor in the console.

-

Git

-

Add the following lines to ~/.gitconfig:

-
[merge]
-tool = threesome
-
-[mergetool "threesome"]
-cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
-trustExitCode = true
-
-

Note: replace mvim with gvim if you're on Linux, or just plain vim if you prefer to keep the editor in the console.

-

More Information

-

Full Documentation: :help threesome
-Source (Mercurial): http://bitbucket.org/sjl/threesome.vim
-Source (Git): http://github.com/sjl/threesome.vim
-Issues: http://github.com/sjl/threesome.vim/issues
-License: MIT/X11

-
-
- -
-
- - - - - - - - diff -r e65beb74d9d9 -r e6ee416c6eaa threesome.vim/index.markdown --- a/threesome.vim/index.markdown Tue Apr 10 10:18:12 2012 -0400 +++ b/threesome.vim/index.markdown Tue Apr 10 10:19:28 2012 -0400 @@ -63,6 +63,22 @@ **Note:** replace `mvim` with `gvim` if you're on Linux, or just plain `vim` if you prefer to keep the editor in the console. +### Bazaar + +For Bazaar 2.4 or greater, add the following line to bazaar.conf: + + bzr.mergetool.threesome = mvim {base} {this} {other} {result} -c 'ThreesomeInit' + +Optionally, change the default merge tool by setting: + + bzr.default_mergetool = threesome + +For earlier versions of Bazaar, set the following entry in bazaar.conf: + + external_merge = mvim %b %t %o %r -c 'ThreesomeInit' + +**Note:** replace `mvim` with `gvim` if you're on Linux, or just plain `vim` if you prefer to keep the editor in the console. + More Information ---------------- diff -r e65beb74d9d9 -r e6ee416c6eaa threesome.vim/layout.html --- a/threesome.vim/layout.html Tue Apr 10 10:18:12 2012 -0400 +++ b/threesome.vim/layout.html Tue Apr 10 10:19:28 2012 -0400 @@ -78,5 +78,18 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); +