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

Re: [PATCH 0/2] merging renames of empty files

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

Jeff King [off-list ref] writes:
On Thu, Mar 22, 2012 at 04:37:05PM -0700, Junio C Hamano wrote:
quoted
Hrm. As this is probably useful for older maintenance track, I would have
preferred not to see the first one that touches sequencer.c that did not
exist in the 1.7.7.x maintenance track, as the change is purely "cosmetic"
and does not have anything to do with fixing the over-agressive merge.
I considered that, but assumed this was not a maint fix, but rather a
new "feature" to improve the heuristics.
Ok. Perhaps I over-reacted to the issue, which sounded like a grave
mismerge that can go unnoticed.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help