summaryrefslogtreecommitdiffstats
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-09-14 20:16:47 +0200
committerJunio C Hamano <gitster@pobox.com>2023-09-14 20:17:00 +0200
commitbda494f4043963b9ec9a1ecd4b19b7d1cd9a0518 (patch)
tree58ead9d06a58f8eafa97d8d90404b61087e41ee2 /builtin/merge.c
parentMerge branch 'so/diff-doc-for-patch-update' (diff)
downloadgit-bda494f4043963b9ec9a1ecd4b19b7d1cd9a0518.tar.xz
git-bda494f4043963b9ec9a1ecd4b19b7d1cd9a0518.zip
The ninth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions