From: Junio C Hamano <hidden> Date: 2016-07-01 20:07:47
Junio C Hamano [off-list ref] writes:
quoted
Ok, there was a miniscule conflicts but otherwise the squashed
material was all coming from a single step in the original, so
I did so myself. Let's start merging the result to 'next' ;-)
Thanks.
IOW, this on top of the fixup we discussed.
sideband.c | 9 +++------