From: Junio C Hamano Date: Thu, 17 Dec 2020 05:19:35 GMT Subject: Re: [RFC/PATCH] mergetool: use resolved conflicts in all the views Message-ID: In-Reply-To: <5fda9b3f4979c_973f2083@natae.notmuch> Felipe Contreras writes: > The implementation details of the proposed patch are not relevant at > this point; it was just to show an example of what Seth's diffconflicts > vim plugin does. Sorry for commenting on the "irrelevant" part; as the patch was marked with RFC label, I bothered to read it and tried to give comments, but it wasn't clear which part was welcoming comments and which parts were off limits ;-)