On Tue, May 08, 2007 at 04:50:36PM -0500, Robert Lee wrote: > The SVN Repos has conflict markers left in the file filetype.vim,
Sorry for the silly question, but the answer is not clear to me from your text: is your working copy that has conflict markers or the last committed version in the repository which has been committed without removing conflict markers? -- Stefano Zacchiroli -*- PhD in Computer Science ............... now what? [EMAIL PROTECTED],debian.org,bononia.it} -%- http://www.bononia.it/zack/ (15:56:48) Zack: e la demo dema ? /\ All one has to do is hit the (15:57:15) Bac: no, la demo scema \/ right keys at the right time