summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-12-22 12:43:16 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-22 12:43:16 -0800
commit2c380e7a8da9bd9a4e40221e36cb68f756d49829 (patch)
treef41d0ead0407447f36d25ca83a96594db3d97b09 /resolve-undo.c
parentMerge branch 'rs/use-strbuf-complete-line' (diff)
downloadtgif-2c380e7a8da9bd9a4e40221e36cb68f756d49829.tar.xz
Third batch for 2.3 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions