Commits

Author Commit Message Labels Comments Date
Steve Losh
New name.
Steve Losh
Add gauge.
Steve Losh
Fix conflict marker regexes.
raphael-proust
fixes issue #7
abudden
Fix for consistency with other instructions on web page.
abudden
Added information on using threesome with Bazaar to website.
abudden
Added information on using threesome with Bazaar to Vim documentation.
abudden
Added modeline (as is common in a lot of help files).
Steve Losh
Add packaging script.
Steve Losh
Added tag v0.2.0 for changeset b8aab52392ea
Steve Losh
Add threesome_leader config option.
Tags
v0.2.0
Steve Losh
Added tag v0.1.1 for changeset 17831680bc89
Steve Losh
Docs.
Tags
v0.1.1
Steve Losh
Set hidden. No easy way around this.
Steve Losh
Fix the binding of \u in grid/other modes.
Steve Losh
Lowercase the mode names to match the mappings.
Steve Losh
Formatting.
Steve Losh
Added tag v0.1.0 for changeset 1d6f4048a9b3
Steve Losh
Increment version.
Tags
v0.1.0
Steve Losh
Remove the rendered site file.
Steve Losh
Add a .gitignore.
Steve Losh
Add "site/index.html" to .hgignore.
Steve Losh
Don't explode when running \n or \N when there are no conflicts left.
Steve Losh
Add GA to the site.
Steve Losh
Update rendered index.
Steve Losh
Fix the paths.
Steve Losh
Add a website!
Steve Losh
Moar help!
Steve Losh
Factor out a bunch of stuff into autoload/.
Steve Losh
Add "tests/*.err" to .hgignore.
  1. Prev
  2. Next