Noah Spurrier wrote:
I used this pattern to select sections of test that belong to me
when CVS or SVN generates a merge conflict. This pattern works fine:
/^<<<<<<<\_.\{-}=======.*$/
I have search highlighting turned on and I can see the multiline
patterns get highlighted as expected.
...snip
Hello!
May I suggest that, at least for this particular purpose, that you might
find the following of interest:
http://vim.sourceforge.net/scripts/script.php?script_id=1370
"CVS conflict resolution using vimdiff"
In a nutshell, it splits conflict files into two files and lets you work
with them using vimdiff.
Regards,
Chip Campbell
