Thread (1 message) 1 message, 1 author, 2016-06-15

Re: feature suggestion: optimize common parts for checkout --conflict=diff3

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:56:41

Possibly related (same subject, not in this thread)

Jeff King [off-list ref] writes:
On Thu, Apr 04, 2013 at 10:49:44PM +0200, Uwe Kleine-König wrote:
quoted
On Thu, Apr 04, 2013 at 04:33:44PM -0400, Jeff King wrote:
quoted
[...]
So I do think zdiff3 is useful, and I plan to continue using it.
Thanks for your description. I'm using and liking zdiff3, too. So I'd
really like seeing it in vanilla git.
I don't know if Junio is interested in taking a patch with the concept
or not,...
In two messages upthread before you restarted this discussion, I
said:

    As long as we clearly present the users what the option does and
    what its implications are, it is not bad to have such an option,
    I think.
but as I recall, your patch needed at least a documentation update
before it could be picked up. Unless Junio wants to say "no, I am
not interested at all", I think the next step would be to repost
an updated version.
Yup.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help