From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jul 2022 19:03:02 GMT
Subject: Re: [PATCH v5 0/8] Fix merge restore state
Message-ID: <xmqqh7353ti1.fsf@gitster.g>
In-Reply-To: <pull.1231.v5.git.1658541198.gitgitgadget@gmail.com>

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

> This started as a simple series to fix restore_state() in builtin/merge.c,
> fixing an issue reported by ZheNing Hu[3]. It now fixes several bugs and has
> grown so much it's hard to call it simple. Anyway...

Thanks.  Unless we hear any more comments, let's start merging it
down to 'next' soonish.