From: Seth House <seth@eseth.com>
Date: Sat, 09 Jan 2021 22:54:00 GMT
Subject: Re: [PATCH v2] fixup! mergetool: add automerge configuration
Message-ID: <20210109225400.GA156779@ellen>
In-Reply-To: <20210109224236.50363-1-davvid@gmail.com>

On Sat, Jan 09, 2021 at 02:42:36PM -0800, David Aguilar wrote:
> Replace "\r" with a substituted variable that contains "\r".
> Replace "\?" with "\{0,1\}".

Nice. I was (very slowly) converging on that as the culprit. Thanks for
the elegant fix! I'm running the test suite on Windows and OSX (now that
they're set up locally) with this included and I'll send a v10 once
complete.