Hi Guys, has anyone implemented a folding/side-by-side plugin for editing files containing merge conflicts? I'm thinking of something like :diffsplit mode.
For example, many configuration management systems mark conflicts in merged files something like this: <<<<<<< file-from-left-branch left side of conflict ------------- file-from-right-branch right side of conflict >>>>>>> Would it even be possible for vim to display the same file in two buffers, one showing the left side of the conflicts and the other showing the right side? Of course have the two buffers correctly bound to each other so that the conflicting code is displayed next to each other, and everything else folded. Editing of course effects both buffers, and once the conflict markers have been removed, the text could be folded up and you would move on to the next conflict, until the file is just one fold-summary :-) There are several plugins for integrating SCM systems with vim, ie: cvs, svn, git, mecurial, etc. but they all seem to concentrate on displaying changes against the repository, adding and committing files and so on. Any other macros or tips for working with conflicts would also be greatly appreciated! Cheers and thanks in advance, Steve --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_use" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
