Re: [PATCH] move get_merge_bases() to core lib; use it in merge-recursive
From: Johannes Schindelin <hidden> Date: 2016-06-15 22:42:31
Hi,
On Thu, 29 Jun 2006, Alex Riesen wrote:
On 6/29/06, Johannes Schindelin [off-list ref] wrote:
quoted
Aargh! Of course this is [PATCH 2/2]. BTW, no signoff, since the whole
merge-recursive is not mergeable yet (passes the tests, but we have a
small way to go).
How did you get it to pass the tests? Maybe you still have git-merge-recursive
as default merge strategy?