summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-06 14:31:16 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-06 14:31:16 +0900
commit7668cbc60578f99a4c048f8f8f38787930b8147b (patch)
tree154b2d6535721b97f59dd164c86e9040ff840044 /builtin/merge-recursive.c
parentMerge branch 'tg/deprecate-stash-save' (diff)
downloadtgif-7668cbc60578f99a4c048f8f8f38787930b8147b.tar.xz
RelNotes: the second batch post 2.15 comes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions