* Steve on Thursday, December 18, 2008 at 05:50:43 -0800 > 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 :-)
Try out Conflict2Diff: http://www.vim.org/scripts/script.php?script_id=621 However, I ended up writing my own 3-way diff for Mercurial. Unfortunately I don't have the time to polish it for publication. c -- \black\trash movie _C O W B O Y_ _C A N O E_ _C O M A_ Ein deutscher Western/A German Western -->> http://www.blacktrash.org/underdogma/ccc.html -->> http://www.blacktrash.org/underdogma/ccc-en.html --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_use" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
