Threesome -> splice
Added vim syntax for git conflict files
Fixes for git find-common and ls-code