Commits

Author Commit Message Labels Comments Date
Steve Losh
Merge pull request #21 from killphi/fix_spliceinit_crash Fixes several crash issues with the latest VIm versions
killphi
fix whitespace, fix numbering
killphi
Implement crash solution given in Google group. link for Google group: https://groups.google.com/forum/#!topic/vim_dev/HgKdV33Jy5I
Steve Losh
Remove unused function.
andrey
Fixes issue #9.
Steve Losh
Changelog.
Tags
v1.0.1
Steve Losh
Fix showing file two in compare view when one/result are open.
Steve Losh
Set the filetype properly in each buffer during init.
Steve Losh
Remain in the proper buffer when diffing.
Steve Losh
Fix some indentation.
Steve Losh
Add a utility for echoing in the IO utils.
Steve Losh
Fix the splice_leader/prefix setting.
Steve Losh
Fancy up the help header.
Steve Losh
doc.
Steve Losh
__future__ize with
Steve Losh
Rename to Splice, and change default prefix.
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
Added tag v0.2.0 for changeset b8aab52392ea
Steve Losh
Add threesome_leader config option.
Tags
v0.2.0
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.
  1. Prev
  2. Next