refactor duplicated fill_mm() in checkout and merge-recursive
authorMichael Lukashov <michael.lukashov@gmail.com>
Tue, 16 Feb 2010 23:42:55 +0000 (23:42 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2010 23:11:33 +0000 (15:11 -0800)
commit06b65939b083ba1b71043005bf83b4883e98264e
tree6e4cc7e05c5de790d78abbbdc1f5cd863a38ec7a
parente923eaeb901ff056421b9007adcbbce271caa7b6
refactor duplicated fill_mm() in checkout and merge-recursive

The following function is duplicated:

  fill_mm

Move it to xdiff-interface.c and rename it 'read_mmblob', as suggested
by Junio C Hamano.

Also, change parameters order for consistency with read_mmfile().

Signed-off-by: Michael Lukashov <michael.lukashov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-checkout.c
merge-recursive.c
xdiff-interface.c
xdiff-interface.h