Re: [PATCH] cache.h: fix mismerge of 'dl/no-extern-in-func-decl'

Junio C Hamano writes: > Denton Liu 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 a

Re: [PATCH] cache.h: fix mismerge of 'dl/no-extern-in-func-decl'

Denton Liu 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. That line is not touched since this February at 7589e636 ("Merge branc

[PATCH] cache.h: fix mismerge of 'dl/no-extern-in-func-decl'

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. Although this is only currently only a problem in 'pu', we should fix the entry rerere cache for if this branch ends up merged in 'next' in t