summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-08 14:34:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-08 14:34:11 -0700
commit7b0d47b3b6b5b64e02a5aa06b0452cadcdb18355 (patch)
treefa9a5fb0556ad50ec0fe5de0b6c94d4f134cc842 /builtin/merge.c
parentMerge branch 'ss/msvc' (diff)
downloadtgif-7b0d47b3b6b5b64e02a5aa06b0452cadcdb18355.tar.xz
Third batch for post 2.8 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions