hg.stevelosh.com > docs.stevelosh.com

<!DOCTYPE html>
<html>
    <head>
        <meta charset="utf-8"/>
        <title>Installation / 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="content">
        <div class="wrap">
            <header><h1><a href="..">Splice</a></h1></header>
                <div class="markdown">
<h1 id="installation"><a href="">Installation</a></h1><div class="toc">
<ul>
<li><a href="#vim-plugin">Vim Plugin</a></li>
<li><a href="#vcs-support">VCS Support</a><ul>
<li><a href="#mercurial">Mercurial</a></li>
<li><a href="#git">Git</a></li>
<li><a href="#bazaar">Bazaar</a></li>
</ul>
</li>
</ul></div>
<h2 id="vim-plugin">Vim Plugin</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>
<div class="codehilite"><pre>hg clone https://bitbucket.org/sjl/splice.vim ~/.vim/bundle/splice
git clone https://github.com/sjl/splice.vim.git ~/.vim/bundle/splice
</pre></div>


<p>Build the docs:</p>
<div class="codehilite"><pre>:call pathogen#helptags()
</pre></div>


<h2 id="vcs-support">VCS Support</h2>
<p>Once you've installed Splice you'll need to configure your version control
system to use it as a merge tool.</p>
<h3 id="mercurial">Mercurial</h3>
<p>Add the following lines to <code>~/.hgrc</code>:</p>
<div class="codehilite"><pre><span class="k">[merge-tools]</span>
<span class="na">splice.executable</span> <span class="o">=</span> <span class="s">mvim</span>
<span class="na">splice.args</span> <span class="o">=</span> <span class="s">-f $base $local $other $output -c 'SpliceInit'</span>
<span class="na">splice.premerge</span> <span class="o">=</span> <span class="s">keep</span>
<span class="na">splice.priority</span> <span class="o">=</span> <span class="s">1</span>
</pre></div>


<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>
<div class="codehilite"><pre><span class="k">[merge]</span>
<span class="na">tool</span> <span class="o">=</span> <span class="s">splice</span>

<span class="k">[mergetool "splice"]</span>
<span class="na">cmd</span> <span class="o">=</span> <span class="s">"mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"</span>
<span class="na">trustExitCode</span> <span class="o">=</span> <span class="s">true</span>
</pre></div>


<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>
<div class="codehilite"><pre>bzr.mergetool.splice = mvim {base} {this} {other} {result} -c 'SpliceInit'
</pre></div>


<p>Optionally, change the default merge tool by setting:</p>
<div class="codehilite"><pre>bzr.default_mergetool = splice
</pre></div>


<p>For earlier versions of Bazaar, set the following entry in bazaar.conf:</p>
<div class="codehilite"><pre>external_merge = mvim %b %t %o %r -c 'SpliceInit'
</pre></div>


<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>
                </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	Fri, 23 Dec 2016 10:50:32 -0500
parents	7c49bcd3e196
children	c215b17e26a3