summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-12-17 22:23:54 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-25 17:10:10 -0800
commitbe6ff8196d9890c1875a75b96320b863dd1fe815 (patch)
tree7f37267c444f4c0456dc291c68bacf4b64e9d066 /.gitignore
parentGit 1.6.6 (diff)
downloadtgif-be6ff8196d9890c1875a75b96320b863dd1fe815.tar.xz
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>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions