From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Dec 2009 06:23:54 +0000 (-0800)
Subject: builtin-merge.c: use standard active_cache macros
X-Git-Tag: v1.7.0-rc0~61^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/be6ff8196d9890c1875a75b96320b863dd1fe815?ds=inline;hp=be6ff8196d9890c1875a75b96320b863dd1fe815

builtin-merge.c: use standard active_cache macros

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>
---