summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-19 16:46:42 +0900
committerJunio C Hamano <gitster@pobox.com>2019-05-19 16:46:42 +0900
commitaa25c82427ae70aebf3b8f970f2afd54e9a2a8c6 (patch)
treea830f927ccaf7164b03602729cc7078c79d5bbf2 /merge.c
parentfab4a8a39666793d407371f519e8b6d25d33fa84 (diff)
downloadgit-aa25c82427ae70aebf3b8f970f2afd54e9a2a8c6.tar.gz
Git 2.22-rc1v2.22.0-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions