On Sun, Jul 13, 2008 at 08:13:55AM +0000, Sverre Hvammen Johansen <hvammen+git@xxxxxxxxx> wrote: > Great that we now are introducing merge in C. Great job Miklos. > However, it is broken as this patch shows. This have been > bisected to 1c7b76be Build in merge. > > The test case when run will record the parents that were asked for which is > fine. However, only c2 is recorded as a parent in the commit object. Both > c1 and c2 should have been recorded. The merge is otherwise working > correctly. Thanks for the testcase, I'm on it. ;-)
Attachment:
pgpoHciNvpKC8.pgp
Description: PGP signature
