threesome.vim: Update site.
| author |
Steve Losh <steve@stevelosh.com> |
| date |
Tue, 10 Apr 2012 10:19:57 -0400 |
| parents |
e6ee416c6eaa
|
| children |
06dcc81b2ce6
|
| branches/tags |
(none) |
| files |
threesome.vim/index.html |
Changes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/threesome.vim/index.html Tue Apr 10 10:19:57 2012 -0400
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<!--[if lt IE 7 ]><html class="ie ie6" lang="en"> <![endif]-->
+<!--[if IE 7 ]><html class="ie ie7" lang="en"> <![endif]-->
+<!--[if IE 8 ]><html class="ie ie8" lang="en"> <![endif]-->
+<!--[if (gte IE 9)|!(IE)]><!--><html lang="en"> <!--<![endif]-->
+
+<head>
+ <meta charset="utf-8" />
+ <base href="/threesome.vim/">
+
+ <title>Threesome - a Vim plugin for resolving three-way merges-</title>
+
+ <meta name="description" content="Threesome is a Vim plugin for resolving three-way merge conflicts"/>
+ <meta name="author" content="Steve Losh"/>
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+
+ <link rel="stylesheet" href="stylesheets/base.css">
+ <link rel="stylesheet" href="stylesheets/skeleton.css">
+ <link rel="stylesheet" href="stylesheets/layout.css">
+
+ <link rel="shortcut icon" href="images/favicon.ico">
+ <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png" />
+ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png" />
+
+ <link href='http://fonts.googleapis.com/css?family=Redressed&subset=latin&v2' rel='stylesheet' type='text/css' />
+</head>
+<body>
+ <div class="container">
+ <div class="five columns sidebar">
+ <h1 class="logo"><a href="">threesome</a></h1>
+
+ <p>
+ Threesome is a Vim plugin for resolving conflicts during three-way merges.
+ </p>
+
+ <p>
+ It's designed to be used as a merge tool for version control systems like
+ Mercurial and Git.
+ </p>
+
+ <nav class="toc">
+ <ul>
+ <li><a href="#demo">Demo</a></li>
+ <li><a href="#requirements">Requirements</a></li>
+ <li><a href="#installation">Installation</a></li>
+ <li><a href="#more-information">More Information</a></li>
+ </ul>
+ </nav>
+ </div>
+
+ <div class="ten columns content offset-by-one">
+ <h2 id="demo">Demo</h2>
+<p><a href="http://vimeo.com/25764692">Watch the demo screencast</a> in HD on Vimeo.</p>
+<h2 id="requirements">Requirements</h2>
+<p>Vim 7.3+ compiled with Python 2.5+ support.</p>
+<p>Yes, that's some (relatively) new stuff. No, I'm not going to support anything less
+than that.</p>
+<p>Threesome is a merge tool which means you'll be working with it on your development
+machine, not over SSH on your servers.</p>
+<p>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.</p>
+<h2 id="installation">Installation</h2>
+<p>Use <a href="http://www.vim.org/scripts/script.php?script_id=2332">Pathogen</a> to install the plugin from your choice of repositories:</p>
+<pre><code>hg clone https://bitbucket.org/sjl/threesome.vim ~/.vim/bundle/threesome
+git clone https://github.com/sjl/threesome.vim.git ~/.vim/bundle/threesome
+</code></pre>
+<p>Build the docs:</p>
+<pre><code>:call pathogen#helptags()
+</code></pre>
+<p>Add it as a merge tool for your VCS of choice.</p>
+<h3 id="mercurial">Mercurial</h3>
+<p>Add the following lines to <code>~/.hgrc</code>:</p>
+<pre><code>[merge-tools]
+threesome.executable = mvim
+threesome.args = -f $base $local $other $output -c 'ThreesomeInit'
+threesome.premerge = keep
+threesome.priority = 1
+</code></pre>
+<p><strong>Note:</strong> replace <code>mvim</code> with <code>gvim</code> if you're on Linux, or just plain <code>vim</code> if you prefer to keep the editor in the console.</p>
+<h3 id="git">Git</h3>
+<p>Add the following lines to <code>~/.gitconfig</code>:</p>
+<pre><code>[merge]
+tool = threesome
+
+[mergetool "threesome"]
+cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
+trustExitCode = true
+</code></pre>
+<p><strong>Note:</strong> replace <code>mvim</code> with <code>gvim</code> if you're on Linux, or just plain <code>vim</code> if you prefer to keep the editor in the console.</p>
+<h3 id="bazaar">Bazaar</h3>
+<p>For Bazaar 2.4 or greater, add the following line to bazaar.conf:</p>
+<pre><code>bzr.mergetool.threesome = mvim {base} {this} {other} {result} -c 'ThreesomeInit'
+</code></pre>
+<p>Optionally, change the default merge tool by setting:</p>
+<pre><code>bzr.default_mergetool = threesome
+</code></pre>
+<p>For earlier versions of Bazaar, set the following entry in bazaar.conf:</p>
+<pre><code>external_merge = mvim %b %t %o %r -c 'ThreesomeInit'
+</code></pre>
+<p><strong>Note:</strong> replace <code>mvim</code> with <code>gvim</code> if you're on Linux, or just plain <code>vim</code> if you prefer to keep the editor in the console.</p>
+<h2 id="more-information">More Information</h2>
+<p><strong>Full Documentation:</strong> <code>:help threesome</code><br />
+<strong>Source (Mercurial):</strong> <a href="http://bitbucket.org/sjl/threesome.vim">http://bitbucket.org/sjl/threesome.vim</a><br />
+<strong>Source (Git):</strong> <a href="http://github.com/sjl/threesome.vim">http://github.com/sjl/threesome.vim</a><br />
+<strong>Issues:</strong> <a href="http://github.com/sjl/threesome.vim/issues">http://github.com/sjl/threesome.vim/issues</a><br />
+<strong>License:</strong> <a href="http://www.opensource.org/licenses/mit-license.php">MIT/X11</a></p>
+ </div>
+ <div class="sixteen columns">
+ <footer>
+ Made by <a href="http://stevelosh.com/">Steve Losh</a>
+ </footer>
+ </div>
+ </div>
+
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js"></script>
+ <script>window.jQuery || document.write("<script src='javascripts/jquery-1.5.1.min.js'>\x3C/script>")</script>
+ <script src="javascripts/app.js"></script>
+
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-15328874-3']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+ </script>
+ <script type="text/javascript">
+ var _gauges = _gauges || [];
+ (function() {
+ var t = document.createElement('script');
+ t.type = 'text/javascript';
+ t.async = true;
+ t.id = 'gauges-tracker';
+ t.setAttribute('data-site-id', '4f843f8c613f5d65280000e6');
+ t.src = '//secure.gaug.es/track.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(t, s);
+ })();
+ </script>
+</body>
+</html>