Re: Humble feature request: 3way-merge diff mode

[Vladimir Marek]

> > 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 ;-)

Ah, I didn't know that script. It works nice for cvs, but it's just
regular 2way merging.

Thanks for the tip

-- 
        Vlad

pgpCwzQoi024e.pgp
Description: PGP signature