From: Jacob Helwig <jacob.helwig@gmail.com>
To: Dan McGee <dpmcgee@gmail.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
David Aguilar <davvid@gmail.com>,
git@vger.kernel.org, Markus Heidelberg <markus.heidelberg@web.de>,
Charles Bailey <charles@hashpling.org>
Subject: Re: [PATCH 2/2] mergetool-lib: add a three-way diff view for vim/gvim
Date: Fri, 24 Sep 2010 12:09:28 -0700 [thread overview]
Message-ID: <20100924190928.GC3768@vfa-6z.perlninja.com> (raw)
In-Reply-To: <AANLkTin-BSAFwvuTyJ96BW6MqrKVEni+Af2M0u7WE_yZ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2236 bytes --]
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@gmail.com> wrote:
> > On Sat, Sep 18, 2010 at 10:34 AM, David Aguilar <davvid@gmail.com> 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@gmail.com>
> >>> ---
> >>>
> >>> 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 #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 665 bytes --]
next prev parent reply other threads:[~2010-09-24 19:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-15 2:21 [PATCH 1/2] mergetool-lib: combine vimdiff and gvimdiff run blocks Dan McGee
2010-09-15 2:21 ` [PATCH 2/2] mergetool-lib: add a three-way diff view for vim/gvim Dan McGee
2010-09-18 7:34 ` David Aguilar
2010-09-19 9:48 ` Felipe Contreras
2010-09-24 19:01 ` Dan McGee
2010-09-24 19:09 ` Jacob Helwig [this message]
2010-09-24 21:38 ` Jeff King
2010-09-25 3:17 ` David Aguilar
2010-09-27 15:19 ` Dan McGee
2010-09-24 21:31 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100924190928.GC3768@vfa-6z.perlninja.com \
--to=jacob.helwig@gmail.com \
--cc=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=dpmcgee@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=markus.heidelberg@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).