git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>, Seth House <seth@eseth.com>
Subject: Re: [PATCH 1/1] mergetools/vimdiff: add vimdiff1 merge tool variant
Date: Tue, 23 Feb 2021 10:55:00 -0800	[thread overview]
Message-ID: <CAJDDKr7ibQH9fJEF2TuZ+S7cRFydX27d7sVvXt5bdfENqba_JA@mail.gmail.com> (raw)
In-Reply-To: <xmqqk0r7rh7l.fsf@gitster.c.googlers.com>

On Tue, Feb 16, 2021 at 10:42 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Seth House <seth@eseth.com> writes:
>
> > This adds yet another vimdiff/gvimdiff variant and presents conflicts as
> > a two-way diff between 'LOCAL' and 'REMOTE'. 'MERGED' is not opened
> > which deviates from the norm so usage text is echoed as a Vim message on
> > startup that instructs the user with how to proceed and how to abort.
> >
> > Vimdiff is well-suited to two-way diffs so this is an option for a more
> > simple, more streamlined conflict resolution. For example: it is
> > difficult to communicate differences across more than two files using
> > only syntax highlighting; default vimdiff commands to get and put
> > changes between buffers do not need the user to manually specify
> > a source or destination buffer when only using two buffers.
> >
> > Like other merge tools that directly compare 'LOCAL' with 'REMOTE', this
> > tool will benefit when paired with the new `mergetool.hideResolved`
> > setting.
> >
> > Signed-off-by: Seth House <seth@eseth.com>
> > ---
> >  mergetools/vimdiff | 13 ++++++++++++-
> >  1 file changed, 12 insertions(+), 1 deletion(-)
>
> Any vimdiff$n + "git mergetool" users care to comment?  Thanks.

Nicely done, thanks Seth.

Looks good to me.  FWIW,
Tested-by: David Aguilar <davvid@gmail.com>

cheers,

--
David

  reply	other threads:[~2021-02-23 18:56 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-14  2:28 [PATCH 0/1] " Seth House
2021-02-14  2:28 ` [PATCH 1/1] " Seth House
2021-02-16 18:38   ` Junio C Hamano
2021-02-23 18:55     ` David Aguilar [this message]
2021-02-25 16:02       ` Seth House
2021-02-25 18:45 ` [PATCH 0/1] " Philippe Blain
2021-02-26  0:29   ` Seth House
2021-02-26  2:04     ` Junio C Hamano
2021-02-26 23:35       ` Seth House
2021-02-27  1:52         ` Junio C Hamano
2021-02-27  2:17           ` Seth House

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=CAJDDKr7ibQH9fJEF2TuZ+S7cRFydX27d7sVvXt5bdfENqba_JA@mail.gmail.com \
    --to=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=seth@eseth.com \
    --subject='Re: [PATCH 1/1] mergetools/vimdiff: add vimdiff1 merge tool variant' \
    /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

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).