From: Elijah Newren Date: Tue, 26 Jul 2022 01:59:55 GMT Subject: Re: [PATCH v5 0/8] Fix merge restore state Message-ID: In-Reply-To: On Mon, Jul 25, 2022 at 12:03 PM Junio C Hamano wrote: > > "Elijah Newren via GitGitGadget" 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. Sounds good; let's plan on that.