diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-17 22:23:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-25 17:10:10 -0800 |
| commit | be6ff8196d9890c1875a75b96320b863dd1fe815 (patch) | |
| tree | 7f37267c444f4c0456dc291c68bacf4b64e9d066 /resolve-undo.c | |
| parent | 902f235378cb2b2f6dd5dd664b9630c95321f0ae (diff) | |
| download | git-be6ff8196d9890c1875a75b96320b863dd1fe815.tar.gz git-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 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions