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

Re: [PATCH 10/10] merge-recursive: add a label for ancestor

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:48:25

Jonathan Nieder [off-list ref] writes:
I would be interested to know which merge tool chokes on |||||||. ;)
As it is, since I haven’t experienced the mechanical misbehavior, I
am targetting humans.
Even if there weren't any broken tools, I think targetting humans is a
good thing to do, as long as we don't break ourselves (including old
rerere database).
That’s the end of the series.  Thanks for reading.
Thanks for writing.  I think this is generally a good thing to have,
and from my cursory look I didn't see anything glaringly wrong except for
the one I already commented on the first patch.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help