summaryrefslogtreecommitdiffstats
path: root/entry.c (unfollow)
Commit message (Collapse)AuthorFilesLines
2009-12-26builtin-merge.c: use standard active_cache macrosJunio C Hamano1-3/+2
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>
2009-12-23Git 1.6.6v1.6.6Junio C Hamano3-4/+6
Signed-off-by: Junio C Hamano <gitster@pobox.com>