summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-04-19 21:42:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-04-19 21:42:08 -0700
commit6a2c2f8d34fa1e8f3bb85d159d354810ed63692e (patch)
tree7a19c036e4ba27ad801ed3cd603d457be2dbc1d3 /resolve-undo.c
parentMerge branch 'jh/memihash-opt' (diff)
downloadtgif-6a2c2f8d34fa1e8f3bb85d159d354810ed63692e.tar.xz
Git 2.13-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions