# HG changeset patch # User Steve Losh # Date 1577137119 18000 # Node ID 31b1a5a3b5ff78f73dffa1698cac99d075a92def # Parent 062b18eebd153c13e6f36577707acb17893cd959 Update URLs diff -r 062b18eebd15 -r 31b1a5a3b5ff Makefile --- a/Makefile Sun Sep 03 14:10:51 2017 +0100 +++ b/Makefile Mon Dec 23 16:38:39 2019 -0500 @@ -15,7 +15,7 @@ cd site && ~/.virtualenvs/d/bin/d pubdocs: site/build/index.html - hg -R ~/src/sjl.bitbucket.org pull -u - rsync --delete -az site/build/ ~/src/sjl.bitbucket.org/splice.vim - hg -R ~/src/sjl.bitbucket.org commit -Am 'splice.vim: Update site.' - hg -R ~/src/sjl.bitbucket.org push + hg -R ~/src/docs.stevelosh.com pull -u + rsync --delete -az site/build/ ~/src/docs.stevelosh.com/splice.vim + hg -R ~/src/docs.stevelosh.com commit -Am 'splice.vim: Update site.' + hg -R ~/src/docs.stevelosh.com push diff -r 062b18eebd15 -r 31b1a5a3b5ff README.markdown --- a/README.markdown Sun Sep 03 14:10:51 2017 +0100 +++ b/README.markdown Mon Dec 23 16:38:39 2019 -0500 @@ -3,7 +3,7 @@ Splice is a Vim plugin for resolving conflicts during three-way merges. -Visit [the site](https://sjl.bitbucket.io/splice.vim/) for more information. +Visit [the site](https://docs.stevelosh.com/splice.vim/) for more information. Troubleshooting --------------- diff -r 062b18eebd15 -r 31b1a5a3b5ff doc/splice.txt --- a/doc/splice.txt Sun Sep 03 14:10:51 2017 +0100 +++ b/doc/splice.txt Mon Dec 23 16:38:39 2019 -0500 @@ -618,10 +618,10 @@ Think you can make Splice better? Awesome. New contributors are always welcome. -Fork the project on BitBucket or GitHub and send a pull request. +Fork the project on Source Hut or GitHub and send a pull request. - BitBucket: http://bitbucket.org/sjl/splice.vim - GitHub: http://github.com/sjl/splice.vim + Source Hut: https://hg.sr.ht/~sjl/splice.vim + GitHub: https://github.com/sjl/splice.vim ============================================================================== 9. Changelog *SpliceChangelog* diff -r 062b18eebd15 -r 31b1a5a3b5ff site/01-installation.markdown --- a/site/01-installation.markdown Sun Sep 03 14:10:51 2017 +0100 +++ b/site/01-installation.markdown Mon Dec 23 16:38:39 2019 -0500 @@ -7,7 +7,7 @@ Use [Pathogen][] to install the plugin from your choice of repositories: - hg clone https://bitbucket.org/sjl/splice.vim ~/.vim/bundle/splice + hg clone https://hg.sr.ht/~sjl/splice.vim ~/.vim/bundle/splice git clone https://github.com/sjl/splice.vim.git ~/.vim/bundle/splice [Pathogen]: http://www.vim.org/scripts/script.php?script_id=2332 diff -r 062b18eebd15 -r 31b1a5a3b5ff site/index.markdown --- a/site/index.markdown Sun Sep 03 14:10:51 2017 +0100 +++ b/site/index.markdown Mon Dec 23 16:38:39 2019 -0500 @@ -2,11 +2,11 @@ Lightroom's user interface. [Watch the demo screencast][screencast] in HD on Vimeo to get an idea of how it works. -**Full Documentation:** `:help splice` -**Source (Mercurial):** -**Source (Git):** -**Issues:** -**License:** [MIT/X11][license] +* **Full Documentation:** `:help splice` +* **Source (Mercurial):** +* **Source (Git):** +* **Issues:** +* **License:** [MIT/X11][license] [license]: http://www.opensource.org/licenses/mit-license.php [screencast]: http://vimeo.com/25764692