Re: What's cooking in git.git (Oct 2011, #05; Fri, 14)
From: Junio C Hamano <hidden> Date: 2016-06-15 22:52:16
Jeff King [off-list ref] writes:
What you queued in d5570f4 looks sane, but the merge into next is
curious.
Thanks for spotting. I think I had rerere that recorded the conflict
resolution with an older iteration of the topic with looser message
default or something.