sjl/threesome.vim — pull request #8 by raphael-proust (2011-11-03 15:01:34+00:00)
Title: fixes issue #7

when looking for conflict markers, use ^ and $ to match exact lines only