From: BENTZ Sylvain <sylvain.bentz@md6.fr>
Date: Thu, 22 Jul 2021 12:53:47 GMT
Subject: RE: Bug: Commit a merge resolution with non-closed conflict markers leads to errs, segfault
Message-ID: <66af2662ae884fff81f51a4eb5ac1dd1@md6.fr>
In-Reply-To: <60f9477d9cd3a_3fba2082@natae.notmuch>

Oh I wasn't aware of this when I initialized my MWE repo, from git-config[1]:

  By default, git-rerere[1] is enabled if there is an rr-cache directory under
  the $GIT_DIR, e.g. if "rerere" was previously used in the repository.

The correct MWE requires to enable rerere:

  git config rerere.enabled true

--
Sylvain Bentz