summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-02-16 20:41:40 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-16 20:41:40 -0800
commite68e29171cc2d6968902e0654b5687fbe1ccb903 (patch)
treec55a3197bb6ae3025e86d8e7d3fbecdcbb0c3404 /builtin/merge-tree.c
parentSync with maint (diff)
parentGit 2.25.1 (diff)
downloadtgif-e68e29171cc2d6968902e0654b5687fbe1ccb903.tar.xz
Sync with 2.25.1
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions