On Fri, 24 Sep 2010 14:01:01 -0500, Dan McGee wrote: > > On Sun, Sep 19, 2010 at 4:48 AM, Felipe Contreras > <felipe.contreras@xxxxxxxxx> wrote: > > On Sat, Sep 18, 2010 at 10:34 AM, David Aguilar <davvid@xxxxxxxxx> wrote: > >> On Tue, Sep 14, 2010 at 09:21:43PM -0500, Dan McGee wrote: > >>> When the base version is available, use a three-way, four panel view by > >>> default. This shows the (local, base, remote) revisions up top and the > >>> merged result by itself in the lower pane. All revisions will still scroll > >>> together by default, and the cursor still defaults to the merged result edit > >>> pane. > >>> > >>> Signed-off-by: Dan McGee <dpmcgee@xxxxxxxxx> > >>> --- > >>> > >>> Vim was one of the few diff commands to not support a three-way merge showing > >>> the base revision, so this is a stab at resolving that shortfall. The biggest > >>> objection I can see to this is making the interface a bit more cumbersome and > >>> bloated. > >>> > >>> An example screenshot of what this produces: > >>> http://www.toofishes.net/media/extra/vim_three_way.png > >>> > >>> -Dan > >> > >> > >> Patch 1/2 of this series looks good to me. > >> > >> Is it worth keeping the old behavior and calling this new > >> mode "vimdiff3" or something along those lines? > >> > >> I'm not a vimdiff user so I'm not be the best person to > >> judge the merits of this change. I like what it's trying > >> to accomplish, though. Are there any vimdiff users > >> with strong feelings either way? > > > > I think this is a definite improvement; the old mode wasn't really > > useful for me. > > Not as much feedback as I had hoped, but thanks to those that did > speak up. I was thinking of adding a separate mode, but I think it > would then get under-used and as I said, every other merge tool was > already doing this anyway. > > So are these patches good to go forward with? No major objections in a > over a week's time. > > -Dan I'd +1 David's suggestion of calling this "vimdiff3", I'd like to still be able to access the current behavior, since I have merge.conflictstyle = diff3, and already see the merge base when I use (g)vimdiff with mergetool. -- Jacob Helwig
Attachment:
signature.asc
Description: Digital signature