Commit Log

commit description author date
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