From: Elijah Newren <newren@gmail.com>
Date: Tue, 23 Aug 2022 03:03:00 GMT
Subject: Re: [PATCH v2 0/3] Miscellaneous merge fixes
Message-ID: <CABPp-BHcRQatt9F2Hj4ygUsS9y8_BmfN3K=YFrLEnCn+2WLz9A@mail.gmail.com>
In-Reply-To: <pull.1331.v2.git.1661222541.gitgitgadget@gmail.com>

On Mon, Aug 22, 2022 at 7:42 PM Elijah Newren via GitGitGadget
<gitgitgadget@gmail.com> wrote:
>
> While working on other things, I noticed a few miscellaneous issues in
> builtin/merge.c. Here's a few small fixes to address them.

Sorry, forgot to include a high level summary:

Changes since v1:
  * Fix play/apply typo, spotted by Eric
  * Almost completely rewrote patch 2; it's now merely a "code cleanup"
  * Added a third patch, just a very minor code simplification