Re: Humble feature request: 3way-merge diff mode
> > I'm using diff mode to do 3way merging.Ah, I didn't know that script. It works nice for cvs, but it's just
> I'm using git and recently hit the same issue.
> I suggest using this script: CVSconflict.vim
> Excellent work from Charles E. Campbell, as usual ;-)
regular 2way merging.
Thanks for the tip