builtin-merge.c: use standard active_cache macros
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Dec 2009 06:23:54 +0000 (22:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 01:10:10 +0000 (17:10 -0800)
Instead of using the low-level index_state interface, use the bog standard
active_cache and active_nr macros to access the cache entries when using the
default one.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found