> > has anyone implemented a folding/side-by-side plugin for editing files > > containing merge conflicts?
> CVSconflict sets up two buffers with the left side being the > "local+merge" file and the right side being the "repository+merge" file, > and applies vimdiff to them. > > http://vim.sourceforge.net/scripts/script.php?script_id=1370 Thanks Chip & Christian, I've gone for Christian's tip (Conflict2Diff) because the three buffer approach works much nicer. But thanks to both of you for your input! Cheers, Steve --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_use" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
