[prev in list] [next in list] [prev in thread] [next in thread] 

List:       vim
Subject:    Re: CVS conflict syntax file
From:       Bram Moolenaar <Bram () moolenaar ! net>
Date:       2002-12-31 9:09:14
[Download RAW message or body]


Alex Jakushev wrote:

> I've created VIM syntax file for files where CVS
> found a conflict.
> 
> Such files may be detected as containing such patterns:
> 
> ^<<<<<<< .*
> ^=======$
> ^>>>>>>> .*
> 
> This syntax file highlights areas where CVS marked a
> conflict, resolve conflict until no highlighting is left :)

Looks useful.

How would Vim recognize a CVS conflict file?

-- 
hundred-and-one symptoms of being an internet addict:
236. You start saving URL's in your digital watch.

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///          Creator of Vim - Vi IMproved -- http://www.vim.org          \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///
[prev in list] [next in list] [prev in thread] [next in thread]