Commit Log

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