projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 902f235) | patch
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)
commitbe6ff8196d9890c1875a75b96320b863dd1fe815
tree7f37267c444f4c0456dc291c68bacf4b64e9d066tree | snapshot
parent902f235378cb2b2f6dd5dd664b9630c95321f0aecommit | diff
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>
builtin-merge.c diff | blob | history
Git—the stupid content tracker