On Wed, 2007-05-16 at 12:09 -0700, Junio C Hamano wrote:
> I do not know if you mistyped dc380d6 (I do not find it there),
I did; it was dc3806d. I don't know how it slipped... I usually
cut'n'paste commit IDs :-/
> but reverting 4493e36 (merge of jc/3way) was intentional. The
> work in that commit that deviates from the mainline is the
> jc/3way topic, which turned out to be incomplete and not very
> usable.
I know it was intentional; but the revert happened on Feb 13, and the
MinGW port is supposed to be merged up to v1.5.1. The revert of dc3806d
("in_merge_bases(): optimization") and 40e0e66 ("merge_base(): move
traversal into a separate function.") also happened on Feb 13, and both
of there commits are still present in the MinGW master branch.
Maybe I'll just try cherry-picking the port's commits on top of the
latest master, and see if anything breaks :)
-az
-
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
