summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-12-22 12:20:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-22 12:20:38 -0800
commitc2e8e4b9da4d007b15faa2e3d407b2fd279f0572 (patch)
tree7c15e63d34d58cb7c902d0aee53d3d75cc56da43 /resolve-undo.c
parentMerge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maint (diff)
downloadtgif-c2e8e4b9da4d007b15faa2e3d407b2fd279f0572.tar.xz
Prepare for 2.2.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions