From: David Aguilar <davvid@gmail.com>
To: Dan McGee <dpmcgee@gmail.com>
Cc: 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: Sat, 18 Sep 2010 00:34:30 -0700 [thread overview]
Message-ID: <20100918073428.GA9850@gmail.com> (raw)
In-Reply-To: <1284517303-17244-2-git-send-email-dpmcgee@gmail.com>
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?
--
David
next prev parent reply other threads:[~2010-09-18 7:33 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 [this message]
2010-09-19 9:48 ` Felipe Contreras
2010-09-24 19:01 ` Dan McGee
2010-09-24 19:09 ` Jacob Helwig
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=20100918073428.GA9850@gmail.com \
--to=davvid@gmail.com \
--cc=charles@hashpling.org \
--cc=dpmcgee@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.