Re: [PATCH v2] fixup! mergetool: add automerge configuration

Seth House [off-list ref] writes:

On Sat, Jan 09, 2021 at 02:42:36PM -0800, David Aguilar wrote:

quoted

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.

Note that the topic fails t7800.5 even with the fix-up (and without
these fix-up on a platform with sed that do not need the portability
fix-up).