Junio C Hamano <gitster@xxxxxxxxx> writes: > Denton Liu <liu.denton@xxxxxxxxx> writes: > >> After merging 'dl/no-extern-in-func-decl' into 'pu', it seems like the >> conflict resolution mostly went well except for one spot, which this >> patch should fix. > > I do not think this is a mismerge per-se. I looked at the merge again, and I agree that it was a simple mismerge. THe function was already there in the common ancestor, and was not changed on the mainline until the "remove extern" topic was merged, so the result should have been a clean 3-way "the mainline did not touch and kept extern, the side branch removed the extern, so the result is to remove it" merge. It was just the change was dwarfed by nearby noise conflicting the "remove extern" which pretty much touches the entire file, with different topics touching different part of the same file. The merge (and more importantly, the rerere database) has been fixed up. Thanks for helping.
