From: Junio C Hamano <junkio@cox.net>
To: Davide Libenzi <davidel@xmailserver.org>
Cc: git@vger.kernel.org
Subject: Re: [RFH] shifting xdiff hunks?
Date: Thu, 13 Apr 2006 16:31:58 -0700 [thread overview]
Message-ID: <7vslohvyq9.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0604131452250.10564@alien.or.mcafeemobile.com> (Davide Libenzi's message of "Thu, 13 Apr 2006 14:55:48 -0700 (PDT)")
Davide Libenzi <davidel@xmailserver.org> writes:
> On Wed, 12 Apr 2006, Davide Libenzi wrote:
>
>> Yes, this is what GNU diff does. It's a post-process of the edit
>> script. Not a problem at all. Till this weekend (included) I'm
>> pretty booked, but I'll do that in the following days.
>
> Dang, that was a short weekend. I found a lunch-time hour for
> this. Would you try to see if this libxdiff-based diff merges on your
> tree?
> See also how it looks for you.
Very impressed, and pleased with the result. I've only taken a
cursory look, but with a very limited number of tests, it looks
much better. Thanks.
For the sake of full disclosure, the reason I wanted consistency
was not for the diff output I quoted earlier, but to help making
the combined patch output cleaner. It does reduce false match
from the infamous 12-way Octopus by Len Brown:
git diff-tree --cc 9fdb62af92c741addbea15545f214a6e89460865
next prev parent reply other threads:[~2006-04-13 23:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-13 6:30 [RFH] shifting xdiff hunks? Junio C Hamano
2006-04-13 6:52 ` Davide Libenzi
2006-04-13 21:55 ` Davide Libenzi
2006-04-13 23:31 ` Junio C Hamano [this message]
2006-04-13 7:44 ` Jakub Narebski
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=7vslohvyq9.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=davidel@xmailserver.org \
--cc=git@vger.kernel.org \
/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