Merge branch 'ml/fill-mm-refactor' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2010 07:38:07 +0000 (23:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2010 07:38:07 +0000 (23:38 -0800)
commit2fc55703c2033af8b7b36e404b3ee9951562e67e
treec2f18c4be345132ddb94609e1a9fbbe2533d42cc
parentefe648b9c8d6caa45a5f7822a80502d1661196b2
parent06b65939b083ba1b71043005bf83b4883e98264e
Merge branch 'ml/fill-mm-refactor' into next

* ml/fill-mm-refactor:
  refactor duplicated fill_mm() in checkout and merge-recursive
builtin-checkout.c