summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-02-25 19:17:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-25 19:18:32 (GMT)
commit2d2118b814c11f509e1aa76cb07110f7231668dc (patch)
treef349aa33a43717a62096dfc04999d71e92ea06c4 /merge-recursive.c
parent325eb6683087bff0fb63f75032c356001fbabf3c (diff)
downloadgit-2d2118b814c11f509e1aa76cb07110f7231668dc.zip
git-2d2118b814c11f509e1aa76cb07110f7231668dc.tar.gz
git-2d2118b814c11f509e1aa76cb07110f7231668dc.tar.bz2
The seventh batch for 2.26
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions