summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-31 14:11:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-31 14:11:38 -0700
commit4b0891ffe4ec3aef081cf48c5f9a747586076f7a (patch)
tree1b19f688d165b53309b2a849dd0ff7dcd64e676c /builtin/merge-tree.c
parentMerge branch 'sb/submodule-deinit-all' into maint (diff)
downloadtgif-4b0891ffe4ec3aef081cf48c5f9a747586076f7a.tar.xz
More topics for 2.8.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions