On Thu, 29 Jan 2009, René Scharfe wrote: > Current master (a34a9dbbc) with the following patch should not > segfault anymore (it doesn't here), but I don't know where the > magic number six is coming from. :-/ Looks like octopus is using multiple merge bases directly, rather than combining them using merge-recursive. The merge-recursive concept turned out to be superior, and we kind of left multiple merge base support hanging. We should probably remove the old support and switch octopus to the better way. My guess is that 6 is just that there happen to be 3 merge bases for this particular merge (plus the merge results and the two sides). -Daniel *This .sig left intentionally blank*
