Eli Zaretskii writes: >> Date: Thu, 13 Mar 2025 09:04:52 -0300 >> Cc: Eli Zaretskii , Dmitry Gutov , >>  Lars Ingebrigtsen , spiegel@gnu.org, jknight@fuhm.net >> From: Mauro Aranda >> >> Eli Zaretskii writes: >> >>  >> Cc: 3860@debbugs.gnu.org, jknight@fuhm.net, spiegel@gnu.org >>  >> From: Dmitry Gutov >>  >> Date: Fri, 22 Jan 2021 00:35:07 +0200 >>  >> >>  >> On 21.01.2021 21:33, Eli Zaretskii wrote: >>  >> > I think if we are going to make this optional with SVN, we should make >>  >> > it optional with the other back-ends as well.  VC always presented a >>  >> > uniform UI and user experience with all back-ends, as far as possible >>  >> > and reasonable.  In this case, I think automatically marking the >>  >> > conflicts as resolved makes a lot of sense, but I won't object to make >>  >> > it opt-out, as long as it's done for every VCS that can support it. >>  >> >>  >> So someone might want to generalize the Git-specific variable: >>  >> vc-git-resolve-conflicts. >>  > >>  > Yes, I think so. >>  > >>  >> But they'd have to consider what to do with the special value >>  >> 'unstage-maybe', which doesn't really make sense for other backends. >>  > >>  > Right. >> >> I took a shot at it.  Please review the attached patch. > > Thanks. > >> +(defcustom vc-bzr-resolve-conflicts 'default >> +  "When non-nil, mark conflicted file as resolved upon saving. > > "If non-nil" is better, IMO. I was going to change it to that, but I realized the text was misleading.  So I rephrased it. >> +If this is non-nil and there are no more conflict markers in the file, >> +VC will mark the saved file as resolved. >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > "VC will mark the conflicts in the saved file as resolved." > > Same comments for doc strings of all the other options, since this > text is repeated in all of them. Thanks.  Revised patch attached.