On Oct 29, 2014 12:45 AM, "Dominique Pellé" <[email protected]> wrote: > > James McCoy wrote: > > > Needing to fallback to :diffget/:diffput instead of do/dp when dealing > > with a 3-way diff has always bothered me. I've been having to do that > > more lately, so the attached patch turns a supplied [count] for do/dp > > into the [bufspec] for :diffget/:diffput. > > > > Obviously, it's not as expressive as being able to use the full bufspec, > > but, at least for me, I always know the buffer number, so providing the > > count is much quicker. > > Hi James > > Your patch looks useful. > > But you wrote "3-way diff" and in my opinion, Vim diff does not > do 3-way diff. Vim can diff 3 files against each other, but that > does not qualify as a 3-way diff.
Sure, but that's beside the point of my email. I agree that Vim doesn't present a3-way diff as nicely as other tools, but it's good enough for what I've been needing to do lately (along with some scripting of diff3). Cheers, James -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
