From: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Date: Thu, 18 Jul 2019 02:32:56 GMT
Subject: Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
Message-ID: <CAOc6etY0tGNeekO7n5pqE_emtRytuSE77o1-fPetpzZPpkfMtA@mail.gmail.com>
In-Reply-To: <CAOc6etYM6DSDQ_H=eJs1xuGU9a83kTe2-vEy9+FEgHobT77_Eg@mail.gmail.com>

On Wed, Jul 17, 2019 at 6:41 PM Edmundo Carmona Antoranz
<eantoranz@gmail.com> wrote:
>
>
> Does it make sense to keep this file in those two situations?

yes it does. disregard the question.