Commit Log

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