summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-13 12:57:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-13 12:57:07 -0700
commit68372c88794aba15f853542008cda39def768372 (patch)
treef2baa0aa4aea77f794f9275eb476d751f20e45b7 /builtin/merge.c
parentMerge branch 'jk/index-pack-maint' (diff)
downloadtgif-68372c88794aba15f853542008cda39def768372.tar.xz
Git 2.18-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions