hg.stevelosh.com > docs.stevelosh.com

<!DOCTYPE html>
<html>
    <head>
        <meta charset="utf-8" />
        <title>Splice</title>
        <link rel="stylesheet" href="./_dmedia/tango.css"/>
        <link rel="stylesheet/less" type="text/css" href="./_dmedia/style.less">
        <script src="./_dmedia/less.js" type="text/javascript">
        </script>
    </head>
    <body class="index">
        <div class="wrap">
            <header><h1><a href="">Splice</a></h1></header>
                <div class="markdown">
<p>Splice is a Vim plugin for resolving three-way merges.  It's inspired by Adobe
Lightroom's user interface.  <a href="http://vimeo.com/25764692">Watch the demo screencast</a> in HD on
Vimeo to get an idea of how it works.</p>
<p><strong>Full Documentation:</strong> <code>:help splice</code><br />
<strong>Source (Mercurial):</strong> <a href="http://bitbucket.org/sjl/splice.vim">http://bitbucket.org/sjl/splice.vim</a><br />
<strong>Source (Git):</strong> <a href="http://github.com/sjl/splice.vim">http://github.com/sjl/splice.vim</a><br />
<strong>Issues:</strong> <a href="http://github.com/sjl/splice.vim/issues">http://github.com/sjl/splice.vim/issues</a><br />
<strong>License:</strong> <a href="http://www.opensource.org/licenses/mit-license.php">MIT/X11</a></p><h2>Table of Contents</h2><ol class="toc"><li><a href="installation/">Installation</a></li></ol>
                </div>
            <footer><p>Created by <a href="http://stevelosh.com">Steve Losh</a>.</p>
<p><br/><a id='rochester-made' href='http://rochestermade.com' title='Rochester Made'><img src='http://rochestermade.com/media/images/rochester-made-dark-on-light.png' alt='Rochester Made' title='Rochester Made' /></a></p></footer>
        </div>
    </body>
</html>
author	Steve Losh <steve@stevelosh.com>
date	Thu, 23 Mar 2017 13:56:10 +0000
parents	7c49bcd3e196
children	c215b17e26a3