Re: [PATCH] move get_merge_bases() to core lib; use it in merge-recursive

From: Alex Riesen <fork0@t-online.de>
Date: 2006-06-30 10:27:13
Johannes Schindelin, Thu, Jun 29, 2006 21:06:56 +0200:
> 
> Okay. Convinced.
> 
> I tested my patch again, and like Alex said, a test fails. But I tested on 
> top of Alex's latest merge-recursive patch, which has that nasty 
> update-index bug, and that is the reason for the test to fail.
> 
> So, a few tests later, I am pretty sure that my patches do not break 
> git-merge-base. I'll prepare another patch series which builds-in 
> merge-base.
> 

Just for reference, I'll repost all my patches again, somewhat
consolidated. Your merge_base patches can be applied on top of that
series.

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Fri Jun 30 10:28:00 2006

This archive was generated by hypermail 2.1.8 : 2006-06-30 10:28:27 EST