From: Sandra Snan <sandra.snan@idiomdrottning.org>
Date: Mon, 06 Nov 2023 21:17:22 GMT
Subject: first-class conflicts?
Message-ID: <87cywmintp.fsf@ellen.idiomdrottning.org>

Is this feature from jj also a good idea for git?
https://martinvonz.github.io/jj/v0.11.0/conflicts/