Merge branch 'en/plug-leaks-in-merge'

author Junio C Hamano <gitster@pobox.com>

Wed, 9 Feb 2022 22:21:00 +0000 (14:21 -0800)

committer Junio C Hamano <gitster@pobox.com>

Wed, 9 Feb 2022 22:21:00 +0000 (14:21 -0800)
author Junio C Hamano <gitster@pobox.com>
Wed, 9 Feb 2022 22:21:00 +0000 (14:21 -0800)
committer Junio C Hamano <gitster@pobox.com>
Wed, 9 Feb 2022 22:21:00 +0000 (14:21 -0800)
diff --cc builtin/merge.c
Simple merge
diff --cc merge-ort.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Wed, 9 Feb 2022 22:21:00 +0000 (14:21 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 9 Feb 2022 22:21:00 +0000 (14:21 -0800)
		1	2
builtin/merge.c	patch \|	diff1 \|	diff2 \|	blob \| history
merge-ort.c	patch \|	diff1 \|	diff2 \|	blob \| history