hg.stevelosh.com > splice.vim

Commit Log

fewer more | at revision 115: (0) -112 tip
commit description author date
de5e5ed6c238 Phrasing default tip Steve Losh Tue, 14 Jan 2020 19:44:43 -0500
e31e1e07fe7a Update URLs Steve Losh Tue, 14 Jan 2020 19:43:32 -0500
002fd11db8e1 Fix URL Steve Losh Mon, 23 Dec 2019 16:40:22 -0500
412677e64c68 Fix docs Steve Losh Mon, 23 Dec 2019 16:39:54 -0500
31b1a5a3b5ff Update URLs Steve Losh Mon, 23 Dec 2019 16:38:39 -0500
062b18eebd15 Fix broken url Jof Arnold Sun, 03 Sep 2017 14:10:51 +0100
287437b3bb6c Added tag v1.1.0 for changeset 61fde9091c13 Steve Losh Sat, 08 Oct 2016 13:09:34 +0000
61fde9091c13 Unfuck the makefile for doc publishing v1.1.0 Steve Losh Sat, 08 Oct 2016 13:08:50 +0000
04114f5e102d Switch the site to use d Steve Losh Sat, 08 Oct 2016 13:06:44 +0000
7a4fe11d400e Add site/build to .hgignore. Steve Losh Sat, 08 Oct 2016 12:56:53 +0000
83293407b6f8 Update changelog Steve Losh Sat, 08 Oct 2016 12:47:20 +0000
136a9256bec2 Plugin should work with Python 2 and 3 now. Stefan Scherfke Thu, 05 Mar 2015 09:38:49 +0100
8e1c1dc358de Merge pull request #21 from killphi/fix_spliceinit_crash Steve Losh Tue, 05 Nov 2013 08:29:36 -0800
ad486b938451 fix whitespace, fix numbering killphi Mon, 16 Sep 2013 12:26:50 +0200
12d0ec667b63 Implement crash solution given in Google group. killphi Fri, 23 Aug 2013 17:07:07 +0200
01e68795c7a1 Remove unused function. Steve Losh Wed, 06 Feb 2013 11:16:24 -0500
4578b7ee5905 Fixes issue #9. andrey Tue, 05 Feb 2013 21:13:53 +1100
e31bbce52b3f Added tag v1.0.1 for changeset 86a478f40df6 Steve Losh Wed, 12 Dec 2012 13:13:04 -0500
86a478f40df6 Changelog. v1.0.1 Steve Losh Wed, 12 Dec 2012 13:12:05 -0500
b655b7e1bfe7 Fix showing file two in compare view when one/result are open. Steve Losh Wed, 12 Dec 2012 13:09:47 -0500
a3dc06785e35 Set the filetype properly in each buffer during init. Steve Losh Wed, 12 Dec 2012 13:02:00 -0500
06491cc1f4a2 Remain in the proper buffer when diffing. Steve Losh Wed, 12 Dec 2012 12:52:52 -0500
79d68c4332bf Fix some indentation. Steve Losh Wed, 12 Dec 2012 12:52:25 -0500
ddce69161ccb Add a utility for echoing in the IO utils. Steve Losh Wed, 12 Dec 2012 12:52:06 -0500
e73227e8f1f9 Fix the splice_leader/prefix setting. Steve Losh Wed, 12 Dec 2012 12:51:15 -0500
22feac7bc424 Fancy up the help header. Steve Losh Sat, 03 Nov 2012 18:07:47 -0400
3a2ab096c039 Added tag v1.0.0 for changeset d6d25c6e5376 Steve Losh Fri, 20 Apr 2012 17:59:20 +0100
d6d25c6e5376 fix packaging script. v1.0.0 Steve Losh Fri, 20 Apr 2012 17:57:42 +0100
b727c135ad6b doc. Steve Losh Fri, 20 Apr 2012 17:49:43 +0100
ade86d98b924 __future__ize with Steve Losh Fri, 20 Apr 2012 15:30:17 +0100
3f8f08e73be9 Add Fugitive notice. Steve Losh Fri, 20 Apr 2012 15:24:31 +0100
0013f7e01b6e Rename to Splice, and change default prefix. Steve Losh Fri, 20 Apr 2012 15:16:48 +0100
c3f318a26db2 Add gauge. Steve Losh Tue, 10 Apr 2012 10:19:23 -0400
bbc5193de145 Fix conflict marker regexes. Steve Losh Thu, 03 Nov 2011 11:15:10 -0400
33fc975d65e2 fixes issue #7 Raphaël Proust Thu, 03 Nov 2011 14:35:09 +0000
369ed2855a55 Fix for consistency with other instructions on web page. A. S. Budden Mon, 19 Sep 2011 13:12:48 +0100
b4b887219024 Added information on using threesome with Bazaar to website. A. S. Budden Mon, 19 Sep 2011 13:11:05 +0100
495ff793a490 Added information on using threesome with Bazaar to Vim documentation. A. S. Budden Mon, 19 Sep 2011 13:09:37 +0100
eab60b05e2b5 Added modeline (as is common in a lot of help files). A. S. Budden Mon, 19 Sep 2011 13:09:10 +0100
52ce70ec32d1 Add packaging script. Steve Losh Fri, 02 Sep 2011 10:09:41 -0400
508f4003088a Added tag v0.2.0 for changeset b8aab52392ea Steve Losh Fri, 02 Sep 2011 09:52:11 -0400
b8aab52392ea Add threesome_leader config option. v0.2.0 Steve Losh Fri, 02 Sep 2011 09:52:05 -0400
e74f19c88d7e Added tag v0.1.1 for changeset 17831680bc89 Steve Losh Fri, 02 Sep 2011 09:36:27 -0400
17831680bc89 Docs. v0.1.1 Steve Losh Fri, 01 Jul 2011 21:04:13 -0400
f0cdadaa3be0 Set hidden. No easy way around this. Steve Losh Fri, 01 Jul 2011 21:03:21 -0400
61c6ca7b2d8a Fix the binding of \u in grid/other modes. Steve Losh Thu, 30 Jun 2011 18:53:30 -0400
8cfa90490884 Lowercase the mode names to match the mappings. Steve Losh Thu, 30 Jun 2011 18:36:50 -0400
c0485a021571 Formatting. Steve Losh Thu, 30 Jun 2011 18:33:12 -0400
d24125017d7f Added tag v0.1.0 for changeset 1d6f4048a9b3 Steve Losh Thu, 30 Jun 2011 18:20:25 -0400
1d6f4048a9b3 Increment version. v0.1.0 Steve Losh Thu, 30 Jun 2011 18:20:21 -0400
ac9e2264f423 Remove the rendered site file. Steve Losh Thu, 30 Jun 2011 18:17:24 -0400
bd1cbdda7ab9 Add a .gitignore. Steve Losh Thu, 30 Jun 2011 18:17:14 -0400
7274a307b439 Add "site/index.html" to .hgignore. Steve Losh Thu, 30 Jun 2011 18:16:42 -0400
e3cad92631fb Don't explode when running \n or \N when there are no conflicts left. Steve Losh Thu, 30 Jun 2011 18:16:06 -0400
5ed1d3cd606d Add GA to the site. Steve Losh Thu, 30 Jun 2011 15:06:09 -0400
a97f6a49752b Update rendered index. Steve Losh Thu, 30 Jun 2011 09:17:57 -0400
13a4c952903a Fix the paths. Steve Losh Thu, 30 Jun 2011 09:14:12 -0400
bbbc99908ae5 Add a website! Steve Losh Wed, 29 Jun 2011 18:20:10 -0400
9b4db1bd103a Moar help! Steve Losh Tue, 28 Jun 2011 18:29:43 -0400
cefc901de8a2 Factor out a bunch of stuff into autoload/. Steve Losh Tue, 28 Jun 2011 17:48:57 -0400
4995b244e11d Add "tests/*.err" to .hgignore. Steve Losh Mon, 13 Jun 2011 23:01:59 -0400
835205fe9bad Add "tests/result" to .hgignore. Steve Losh Mon, 13 Jun 2011 22:29:01 -0400
47d8db3bb3fc Add "tests/original" to .hgignore. Steve Losh Mon, 13 Jun 2011 22:28:56 -0400
44fae1303b52 Add "tests/two" to .hgignore. Steve Losh Mon, 13 Jun 2011 22:28:52 -0400
4f7162aa3541 Add "tests/one" to .hgignore. Steve Losh Mon, 13 Jun 2011 22:28:49 -0400
3908cdb23497 Notes. Steve Losh Mon, 13 Jun 2011 22:04:13 -0400
813b751f6fa3 Added tag v0.0.8 for changeset bd48a1569d09 Steve Losh Mon, 13 Jun 2011 22:01:56 -0400
bd48a1569d09 Changelog. v0.0.8 Steve Losh Mon, 13 Jun 2011 22:01:52 -0400
122c7974b1df Add license file. Steve Losh Mon, 13 Jun 2011 22:01:11 -0400
2f20f9b53933 Markdown. Steve Losh Mon, 13 Jun 2011 22:00:19 -0400
dadef6acf219 Seriously, Vim? God damn it. Steve Losh Mon, 13 Jun 2011 21:53:54 -0400
566ffcc452e2 Added tag v0.0.7 for changeset d13a0763f1b0 Steve Losh Mon, 13 Jun 2011 21:49:25 -0400
d13a0763f1b0 Changelog. v0.0.7 Steve Losh Mon, 13 Jun 2011 21:49:21 -0400
2da3dbb27a42 Todos. Steve Losh Mon, 13 Jun 2011 21:47:27 -0400
bc6297aefe4b Add use hunks for Grid mode. Steve Losh Mon, 13 Jun 2011 21:46:11 -0400
d4684baf9cfe Add use hunk functionality for Compare and Path modes. Steve Losh Mon, 13 Jun 2011 21:28:36 -0400
338639048930 Start the use hunk functionality. Steve Losh Mon, 13 Jun 2011 21:18:06 -0400
0797e3cc5020 Oh hell yes, Python 2.5. Steve Losh Mon, 13 Jun 2011 21:17:54 -0400
83d8eb7f58e8 Clean up buffer handling. Steve Losh Mon, 13 Jun 2011 20:58:58 -0400
9539ae8686cd Added tag v0.0.6 for changeset 83130fbbc7f9 Steve Losh Mon, 13 Jun 2011 20:44:37 -0400
83130fbbc7f9 HUD highlighting, wrapping and more. v0.0.6 Steve Losh Mon, 13 Jun 2011 20:43:36 -0400
7db534146a3e Fix grid goto result, and hurr durr markdown. Steve Losh Mon, 13 Jun 2011 19:05:27 -0400
3a2ecf1356ef I has an (ugly) HUD! Steve Losh Mon, 13 Jun 2011 18:56:09 -0400
1a5a7431190f Added tag v0.0.5 for changeset b9e75c5a9f2c Steve Losh Mon, 13 Jun 2011 17:27:57 -0400
b9e75c5a9f2c Add boolsetting() and clean up a bit. v0.0.5 Steve Losh Mon, 13 Jun 2011 17:27:42 -0400
c716ddab8449 Configurable scrollbinding! Steve Losh Mon, 13 Jun 2011 17:24:49 -0400
94dd97c75c52 Added tag v0.0.4 for changeset 67daf5c309d3 Steve Losh Mon, 13 Jun 2011 16:48:58 -0400
67daf5c309d3 Add changelog entry. v0.0.4 Steve Losh Mon, 13 Jun 2011 16:48:50 -0400
209e33502f27 Add the initial diff settings. Steve Losh Mon, 13 Jun 2011 16:32:33 -0400
437b4b34d319 Docs. Steve Losh Mon, 13 Jun 2011 16:15:20 -0400
fe0302428a49 Add initial settings. Steve Losh Mon, 13 Jun 2011 16:13:44 -0400
2b0e5d916649 Add a few doc tweaks and a TODO list. Steve Losh Mon, 13 Jun 2011 15:48:03 -0400
529e0dedf98c Cleanup and layout documentation. Steve Losh Mon, 13 Jun 2011 15:22:09 -0400
2358d83d3830 And now we have layouts. Steve Losh Mon, 13 Jun 2011 15:18:55 -0400
124cbd25b6a9 Added tag v0.0.2 for changeset 57a4142285fb Steve Losh Mon, 13 Jun 2011 14:43:41 -0400
57a4142285fb Doc tweaks. v0.0.2 Steve Losh Mon, 13 Jun 2011 14:43:33 -0400
110df92610ac First draft of the docs is done. Steve Losh Mon, 13 Jun 2011 14:39:10 -0400
27f2b1ae4f34 Moar help. Steve Losh Mon, 13 Jun 2011 14:09:34 -0400
48a4ac7ce632 Halp. Steve Losh Mon, 13 Jun 2011 13:36:32 -0400
1284db97b0f2 Add requirements. Steve Losh Mon, 13 Jun 2011 13:12:29 -0400
4267ab99b32b More readme. Steve Losh Mon, 13 Jun 2011 12:56:51 -0400
112752863b5b Typo. Steve Losh Mon, 13 Jun 2011 12:54:19 -0400
158ad3aea810 Installation. Steve Losh Mon, 13 Jun 2011 12:52:56 -0400
11bf5263576c GO AWAY, DIFFS. Steve Losh Mon, 13 Jun 2011 09:39:02 -0400
4bfdd4a89d4c Added tag semver for changeset a7fd8bdc3c5a Steve Losh Mon, 13 Jun 2011 01:09:41 -0400
a7fd8bdc3c5a Added tag v0.0.1 for changeset c353930abfc4 semver Steve Losh Mon, 13 Jun 2011 01:09:38 -0400
c353930abfc4 Quitting keys. v0.0.1 Steve Losh Mon, 13 Jun 2011 01:07:55 -0400
890a1d687c33 Diffoff and some cleanup. Steve Losh Mon, 13 Jun 2011 01:03:56 -0400
0e3a284792b2 Warning. Steve Losh Mon, 13 Jun 2011 00:50:43 -0400
0d5394864481 Path view and next/prev conflicts. Steve Losh Mon, 13 Jun 2011 00:47:04 -0400
bb3247356f22 Compare mode. Steve Losh Mon, 13 Jun 2011 00:25:16 -0400
02506b7b8b92 I has a loupe! Steve Losh Sun, 12 Jun 2011 23:33:31 -0400
fewer more | at revision 115: (0) -112 tip