On 1/10/07, Junio C Hamano <junkio@xxxxxxx> wrote:
This comes on top of yours. I'm reproducing all the merges in linux-2.6 history to make sure the base one, yours and this produce the same result (the same clean merge, or the same unmerged index and the same diff from HEAD). So far it is looking good.
Yep. Tried the monster merge on it: 1m15sec on that small laptop. For whatever reason your patch left an "if (cache_dirty) flush_cache()", that's after my patch + yours. Had it removed. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html