RE: Bug: Commit a merge resolution with non-closed conflict markers leads to errs, segfault
To
Felipe Contreras
git@vger.kernel.org
From
BENTZ Sylvain
See Also
Prev Ref 1
Date
2021-07-22 12:53:47 UTC
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