summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-21 15:15:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-21 15:15:26 -0700
commite9c6d3dcc2112f0d6190681211ea76b714fcd704 (patch)
treeca7f98f1c85413f858831050adc08bc07755fc23 /resolve-undo.c
parentMerge branch 'rs/strbuf-remove-fix' (diff)
parentunpack-trees: pass checkout state explicitly to check_updates() (diff)
downloadtgif-e9c6d3dcc2112f0d6190681211ea76b714fcd704.tar.xz
Merge branch 'rs/unpack-trees-reduce-file-scope-global'
Code cleanup. * rs/unpack-trees-reduce-file-scope-global: unpack-trees: pass checkout state explicitly to check_updates()
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions