--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/splice.vim/_dmedia/goodwolf.css Mon Dec 23 16:39:49 2019 -0500
@@ -0,0 +1,62 @@
+/* @override http://localhost:8080/media/css/pygments-monokai-light.css */
+div.highlight .hll { background-color: #FFD7EF; display: block; }
+div.highlight .err { color: #fff; background-color: #f00 } /* Error */
+div.highlight .gi { font-weight: bold } /* Diff Insert */
+div.highlight .gd { font-weight: bold } /* Diff Delete */
+div.highlight .k { color: #111} /* Keyword */
+div.highlight .l { color: #111 } /* Literal */
+div.highlight .n { color: #111 } /* Name */
+div.highlight .o { color: #111 } /* Operator */
+div.highlight .p { color: #111 } /* Punctuation */
+div.highlight .c { color: #714678; font-style: italic; font-weight: bold; } /* Comment */
+div.highlight .cm { color: #714678; font-style: italic; font-weight: bold; } /* Comment.Multiline */
+div.highlight .cp { color: #714678; font-style: italic; font-weight: bold; } /* Comment.Preproc */
+div.highlight .c1 { color: #714678; font-style: italic; font-weight: bold; } /* Comment.Single */
+div.highlight .cs { color: #714678; font-style: italic; font-weight: bold; } /* Comment.Special */
+div.highlight .ge { font-style: italic } /* Generic.Emph */
+div.highlight .gs { font-weight: bold } /* Generic.Strong */
+div.highlight .kc { color: #111 } /* Keyword.Constant */
+div.highlight .kd { color: #111 } /* Keyword.Declaration */
+div.highlight .kn { color: #111 } /* Keyword.Namespace */
+div.highlight .kp { color: #111 } /* Keyword.Pseudo */
+div.highlight .kr { color: #111 } /* Keyword.Reserved */
+div.highlight .kt { color: #111 } /* Keyword.Type */
+div.highlight .ld { color: #111 } /* Literal.Date */
+div.highlight .m { color: #111 } /* Literal.Number */
+div.highlight .s { color: #111; font-style: italic; } /* Literal.String */
+div.highlight .na { color: #111 } /* Name.Attribute */
+div.highlight .nb { color: #111 } /* Name.Builtin */
+div.highlight .nc { color: #111 } /* Name.Class */
+div.highlight .no { color: #111 } /* Name.Constant */
+div.highlight .nd { color: #111 } /* Name.Decorator */
+div.highlight .ni { color: #111 } /* Name.Entity */
+div.highlight .ne { color: #111 } /* Name.Exception */
+div.highlight .nf { color: #111} /* Name.Function */
+div.highlight .nl { color: #111 } /* Name.Label */
+div.highlight .nn { color: #111} /* Name.Namespace */
+div.highlight .nx { color: #111 } /* Name.Other */
+div.highlight .py { color: #111 } /* Name.Property */
+div.highlight .nt { color: #111 } /* Name.Tag */
+div.highlight .nv { color: #111 } /* Name.Variable */
+div.highlight .ow { color: #111 } /* Operator.Word */
+div.highlight .w { color: #111 } /* Text.Whitespace */
+div.highlight .mf { color: #111 } /* Literal.Number.Float */
+div.highlight .mh { color: #111 } /* Literal.Number.Hex */
+div.highlight .mi { color: #111 } /* Literal.Number.Integer */
+div.highlight .mo { color: #111 } /* Literal.Number.Oct */
+div.highlight .sb { color: #111 } /* Literal.String.Backtick */
+div.highlight .sc { color: #111 } /* Literal.String.Char */
+div.highlight .sd { color: #111 } /* Literal.String.Doc */
+div.highlight .s2 { color: #111 } /* Literal.String.Double */
+div.highlight .se { color: #111 } /* Literal.String.Escape */
+div.highlight .sh { color: #111 } /* Literal.String.Heredoc */
+div.highlight .si { color: #111 } /* Literal.String.Interpol */
+div.highlight .sx { color: #111 } /* Literal.String.Other */
+div.highlight .sr { color: #111 } /* Literal.String.Regex */
+div.highlight .s1 { color: #111 } /* Literal.String.Single */
+div.highlight .ss { color: #111 } /* Literal.String.Symbol */
+div.highlight .bp { color: #111 } /* Name.Builtin.Pseudo */
+div.highlight .vc { color: #111 } /* Name.Variable.Class */
+div.highlight .vg { color: #111 } /* Name.Variable.Global */
+div.highlight .vi { color: #111 } /* Name.Variable.Instance */
+div.highlight .il { color: #111 } /* Literal.Number.Integer.Long */
--- a/splice.vim/_dmedia/style.less Mon Dec 23 16:32:33 2019 -0500
+++ b/splice.vim/_dmedia/style.less Mon Dec 23 16:39:49 2019 -0500
@@ -2,11 +2,11 @@
overflow-y: scroll;
}
.wrap {
- width: 600px;
+ width: 640px;
margin: 40px auto 180px;
}
body {
- font-size: 18px;
+ font-size: 16px;
line-height: 1.4;
font-family: Georgia, Palatino, "Palatino Linotype", serif;
color: #111111;
@@ -27,11 +27,11 @@
}
}
h1 {
- font-size: 48px;
+ font-size: 40px;
line-height: 1;
}
h2 {
- font-size: 34px;
+ font-size: 28px;
line-height: 1;
margin-top: 40px;
margin-bottom: 0;
@@ -44,7 +44,7 @@
}
}
h3 {
- font-size: 26px;
+ font-size: 22px;
line-height: 1;
margin-top: 40px;
margin-bottom: 0;
@@ -57,7 +57,7 @@
}
}
h4 {
- font-size: 20px;
+ font-size: 18px;
line-height: 1;
margin-top: 30px;
margin-bottom: 0;
@@ -83,7 +83,7 @@
}
}
pre {
- font-size: 15px;
+ font-size: 14px;
line-height: 1.3;
white-space: pre;
overflow-x: auto;
@@ -93,7 +93,7 @@
font-family: Menlo, Monaco, Consolas, monospace;
}
code {
- font-size: 15px;
+ font-size: 14px;
border: 1px solid #fdd;
background: #fffafa;
padding: 1px 4px;
--- a/splice.vim/_dmedia/tango.css Mon Dec 23 16:32:33 2019 -0500
+++ b/splice.vim/_dmedia/tango.css Mon Dec 23 16:39:49 2019 -0500
@@ -1,6 +1,6 @@
.codehilite .hll { background-color: #ffffcc }
.codehilite .c { color: #8f5902; font-style: italic } /* Comment */
-.codehilite .err { color: #a40000; border: 1px solid #ef2929 } /* Error */
+.codehilite .err { color: #000000; } /* Error */
.codehilite .g { color: #000000 } /* Generic */
.codehilite .k { color: #204a87; font-weight: bold } /* Keyword */
.codehilite .l { color: #000000 } /* Literal */
@@ -61,7 +61,7 @@
.codehilite .sx { color: #4e9a06 } /* Literal.String.Other */
.codehilite .sr { color: #4e9a06 } /* Literal.String.Regex */
.codehilite .s1 { color: #4e9a06 } /* Literal.String.Single */
-.codehilite .ss { color: #4e9a06 } /* Literal.String.Symbol */
+.codehilite .ss { color: #000000 } /* Literal.String.Symbol */
.codehilite .bp { color: #3465a4 } /* Name.Builtin.Pseudo */
.codehilite .vc { color: #000000 } /* Name.Variable.Class */
.codehilite .vg { color: #000000 } /* Name.Variable.Global */
--- a/splice.vim/index.html Mon Dec 23 16:32:33 2019 -0500
+++ b/splice.vim/index.html Mon Dec 23 16:39:49 2019 -0500
@@ -15,14 +15,16 @@
<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>
+<ul>
+<li><strong>Full Documentation:</strong> <code>:help splice</code></li>
+<li><strong>Source (Mercurial):</strong> <a href="https://hg.sr.ht/sjl/splice.vim">https://hg.sr.ht/sjl/splice.vim</a></li>
+<li><strong>Source (Git):</strong> <a href="https://github.com/sjl/splice.vim">https://github.com/sjl/splice.vim</a></li>
+<li><strong>Issues:</strong> <a href="https://github.com/sjl/splice.vim/issues">https://github.com/sjl/splice.vim/issues</a></li>
+<li><strong>License:</strong> <a href="http://www.opensource.org/licenses/mit-license.php">MIT/X11</a></li>
+</ul><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>
+<p><br/><a id='rochester-made' href='http://rochestermade.com' title='Rochester Made'><img src='https://rochestermade.com/media/images/rochester-made-dark-on-light.png' alt='Rochester Made' title='Rochester Made' /></a></p></footer>
</div>
</body>
</html>
--- a/splice.vim/installation/index.html Mon Dec 23 16:32:33 2019 -0500
+++ b/splice.vim/installation/index.html Mon Dec 23 16:39:49 2019 -0500
@@ -24,13 +24,13 @@
</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
+<div class="codehilite"><pre><span/>hg clone https://hg.sr.ht/~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()
+<div class="codehilite"><pre><span/>:call pathogen#helptags()
</pre></div>
@@ -39,7 +39,7 @@
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>
+<div class="codehilite"><pre><span/><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>
@@ -50,7 +50,7 @@
<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>
+<div class="codehilite"><pre><span/><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>
@@ -62,24 +62,24 @@
<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'
+<div class="codehilite"><pre><span/>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
+<div class="codehilite"><pre><span/>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'
+<div class="codehilite"><pre><span/>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>
+<p><br/><a id="rochester-made" href="http://rochestermade.com" title="Rochester Made"><img src="https://rochestermade.com/media/images/rochester-made-dark-on-light.png" alt="Rochester Made" title="Rochester Made"/></a></p></footer>
</div>
</body>
</html>
\ No newline at end of file