summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-03 09:25:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-03 09:30:58 -0700
commite5056c05ecd2bdaceaa95e12e9e94b1584ec59c8 (patch)
tree55a401f2a8b965837b85de656c92ca7caae0dabb /resolve-undo.h
parentMerge branch 'pt/gitk' (diff)
downloadtgif-e5056c05ecd2bdaceaa95e12e9e94b1584ec59c8.tar.xz
Git 1.7.10-rc4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions