Commit Log

commit description author date
d6d25c6e5376 fix packaging script. v1.0.0 Steve Losh 2012-04-20
b727c135ad6b doc. Steve Losh 2012-04-20
ade86d98b924 __future__ize with Steve Losh 2012-04-20
3f8f08e73be9 Add Fugitive notice. Steve Losh 2012-04-20
0013f7e01b6e Rename to Splice, and change default prefix. Steve Losh 2012-04-20
c3f318a26db2 Add gauge. Steve Losh 2012-04-10
bbc5193de145 Fix conflict marker regexes. Steve Losh 2011-11-03
33fc975d65e2 fixes issue #7 Raphaël Proust 2011-11-03
369ed2855a55 Fix for consistency with other instructions on web page. A. S. Budden 2011-09-19
b4b887219024 Added information on using threesome with Bazaar to website. A. S. Budden 2011-09-19
495ff793a490 Added information on using threesome with Bazaar to Vim documentation. A. S. Budden 2011-09-19
eab60b05e2b5 Added modeline (as is common in a lot of help files). A. S. Budden 2011-09-19
52ce70ec32d1 Add packaging script. Steve Losh 2011-09-02
508f4003088a Added tag v0.2.0 for changeset b8aab52392ea Steve Losh 2011-09-02
b8aab52392ea Add threesome_leader config option. v0.2.0 Steve Losh 2011-09-02
e74f19c88d7e Added tag v0.1.1 for changeset 17831680bc89 Steve Losh 2011-09-02
17831680bc89 Docs. v0.1.1 Steve Losh 2011-07-02
f0cdadaa3be0 Set hidden. No easy way around this. Steve Losh 2011-07-02
61c6ca7b2d8a Fix the binding of \u in grid/other modes. Steve Losh 2011-06-30
8cfa90490884 Lowercase the mode names to match the mappings. Steve Losh 2011-06-30
c0485a021571 Formatting. Steve Losh 2011-06-30
d24125017d7f Added tag v0.1.0 for changeset 1d6f4048a9b3 Steve Losh 2011-06-30
1d6f4048a9b3 Increment version. v0.1.0 Steve Losh 2011-06-30
ac9e2264f423 Remove the rendered site file. Steve Losh 2011-06-30
bd1cbdda7ab9 Add a .gitignore. Steve Losh 2011-06-30
7274a307b439 Add "site/index.html" to .hgignore. Steve Losh 2011-06-30
e3cad92631fb Don't explode when running \n or \N when there are no conflicts left. Steve Losh 2011-06-30
5ed1d3cd606d Add GA to the site. Steve Losh 2011-06-30
a97f6a49752b Update rendered index. Steve Losh 2011-06-30
13a4c952903a Fix the paths. Steve Losh 2011-06-30
bbbc99908ae5 Add a website! Steve Losh 2011-06-29
9b4db1bd103a Moar help! Steve Losh 2011-06-28
cefc901de8a2 Factor out a bunch of stuff into autoload/. Steve Losh 2011-06-28
4995b244e11d Add "tests/*.err" to .hgignore. Steve Losh 2011-06-14
835205fe9bad Add "tests/result" to .hgignore. Steve Losh 2011-06-14
47d8db3bb3fc Add "tests/original" to .hgignore. Steve Losh 2011-06-14
44fae1303b52 Add "tests/two" to .hgignore. Steve Losh 2011-06-14
4f7162aa3541 Add "tests/one" to .hgignore. Steve Losh 2011-06-14
3908cdb23497 Notes. Steve Losh 2011-06-14
813b751f6fa3 Added tag v0.0.8 for changeset bd48a1569d09 Steve Losh 2011-06-14
bd48a1569d09 Changelog. v0.0.8 Steve Losh 2011-06-14
122c7974b1df Add license file. Steve Losh 2011-06-14
2f20f9b53933 Markdown. Steve Losh 2011-06-14
dadef6acf219 Seriously, Vim? God damn it. Steve Losh 2011-06-14
566ffcc452e2 Added tag v0.0.7 for changeset d13a0763f1b0 Steve Losh 2011-06-14
d13a0763f1b0 Changelog. v0.0.7 Steve Losh 2011-06-14
2da3dbb27a42 Todos. Steve Losh 2011-06-14
bc6297aefe4b Add use hunks for Grid mode. Steve Losh 2011-06-14
d4684baf9cfe Add use hunk functionality for Compare and Path modes. Steve Losh 2011-06-14
338639048930 Start the use hunk functionality. Steve Losh 2011-06-14
0797e3cc5020 Oh hell yes, Python 2.5. Steve Losh 2011-06-14
83d8eb7f58e8 Clean up buffer handling. Steve Losh 2011-06-14
9539ae8686cd Added tag v0.0.6 for changeset 83130fbbc7f9 Steve Losh 2011-06-14
83130fbbc7f9 HUD highlighting, wrapping and more. v0.0.6 Steve Losh 2011-06-14
7db534146a3e Fix grid goto result, and hurr durr markdown. Steve Losh 2011-06-13
3a2ecf1356ef I has an (ugly) HUD! Steve Losh 2011-06-13
1a5a7431190f Added tag v0.0.5 for changeset b9e75c5a9f2c Steve Losh 2011-06-13
b9e75c5a9f2c Add boolsetting() and clean up a bit. v0.0.5 Steve Losh 2011-06-13
c716ddab8449 Configurable scrollbinding! Steve Losh 2011-06-13
94dd97c75c52 Added tag v0.0.4 for changeset 67daf5c309d3 Steve Losh 2011-06-13
67daf5c309d3 Add changelog entry. v0.0.4 Steve Losh 2011-06-13
209e33502f27 Add the initial diff settings. Steve Losh 2011-06-13
437b4b34d319 Docs. Steve Losh 2011-06-13
fe0302428a49 Add initial settings. Steve Losh 2011-06-13
2b0e5d916649 Add a few doc tweaks and a TODO list. Steve Losh 2011-06-13
529e0dedf98c Cleanup and layout documentation. Steve Losh 2011-06-13
2358d83d3830 And now we have layouts. Steve Losh 2011-06-13
124cbd25b6a9 Added tag v0.0.2 for changeset 57a4142285fb Steve Losh 2011-06-13
57a4142285fb Doc tweaks. v0.0.2 Steve Losh 2011-06-13
110df92610ac First draft of the docs is done. Steve Losh 2011-06-13
27f2b1ae4f34 Moar help. Steve Losh 2011-06-13
48a4ac7ce632 Halp. Steve Losh 2011-06-13
1284db97b0f2 Add requirements. Steve Losh 2011-06-13
4267ab99b32b More readme. Steve Losh 2011-06-13
112752863b5b Typo. Steve Losh 2011-06-13
158ad3aea810 Installation. Steve Losh 2011-06-13
11bf5263576c GO AWAY, DIFFS. Steve Losh 2011-06-13
4bfdd4a89d4c Added tag semver for changeset a7fd8bdc3c5a Steve Losh 2011-06-13
a7fd8bdc3c5a Added tag v0.0.1 for changeset c353930abfc4 semver Steve Losh 2011-06-13
c353930abfc4 Quitting keys. v0.0.1 Steve Losh 2011-06-13
890a1d687c33 Diffoff and some cleanup. Steve Losh 2011-06-13
0e3a284792b2 Warning. Steve Losh 2011-06-13
0d5394864481 Path view and next/prev conflicts. Steve Losh 2011-06-13
bb3247356f22 Compare mode. Steve Losh 2011-06-13
02506b7b8b92 I has a loupe! Steve Losh 2011-06-13
adb7e3942b34 Omg something works. Steve Losh 2011-06-13
0a0ec65f5e57 Skeleton. Steve Losh 2011-06-13
ee71fd579f4f Skeleton. Steve Losh 2011-06-12
97c9fd0ac4a4 Initial commit. Steve Losh 2011-06-11