From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Felipe Gonçalves Assis" <felipeg.assis@gmail.com>, git@vger.kernel.org
Subject: Re: Custom merge driver with no rename detection
Date: Mon, 15 Feb 2016 09:06:53 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1602150854520.2964@virtualbox> (raw)
In-Reply-To: <xmqqpovyr22u.fsf@gitster.mtv.corp.google.com>
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
Hi Junio,
On Sun, 14 Feb 2016, Junio C Hamano wrote:
> Felipe Gonçalves Assis <felipeg.assis@gmail.com> writes:
>
> > The usual workaround is using the resolve strategy, but apparently it
> > ignores the custom merge driver.
>
> Hmph.
>
> Indeed, git-merge-file seems to call xdl_merge() directly, bypassing
> the ll_merge(), which is understandable as the former predates the
> latter. That needs to be fixed, I think.
I think this is by design. (Because I designed it.)
The original idea of git-merge-file was to serve as a drop-in replacement
for GNU/BSD merge when you want to avoid to be subject to the vagaries of
the GNU vs BSD implementations.
Ciao,
Dscho
next prev parent reply other threads:[~2016-02-15 8:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-14 19:51 Custom merge driver with no rename detection Felipe Gonçalves Assis
2016-02-15 5:10 ` Junio C Hamano
2016-02-15 8:06 ` Johannes Schindelin [this message]
2016-02-15 9:57 ` Junio C Hamano
2016-02-15 8:06 ` Johannes Schindelin
2016-02-15 10:42 ` Felipe Gonçalves Assis
2016-02-15 11:03 ` Junio C Hamano
2016-02-16 1:04 ` Felipe Gonçalves Assis
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=alpine.DEB.2.20.1602150854520.2964@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=felipeg.assis@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).