On 11/24/07, Vladimir Marek <[EMAIL PROTECTED]> wrote: > Hi, > > I'm using diff mode to do 3way merging. >
I'm using git and recently hit the same issue. I suggest using this script: CVSconflict.vim http://vim.sourceforge.net/scripts/script.php?script_id=1370 Excellent work from Charles E. Campbell, as usual ;-) -- Christian -- http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside ! --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
