From: Junio C Hamano Date: Thu, 24 Sep 2026 20:36:47 GMT Subject: Re: [PATCH 1/7] [doc] Add new gitmergeconflicts man page Message-ID: In-Reply-To: "Julia Evans via GitGitGadget" writes: > Documentation/Makefile | 1 + > Documentation/gitmergeconflicts.adoc | 294 +++++++++++++++++++++++++++ > Documentation/meson.build | 1 + > 3 files changed, 296 insertions(+) > create mode 100644 Documentation/gitmergeconflicts.adoc > > diff --git a/Documentation/Makefile b/Documentation/Makefile > index f8dea4b395..bc49641dda 100644 > --- a/Documentation/Makefile > +++ b/Documentation/Makefile > @@ -58,6 +58,7 @@ MAN7_TXT += gitdiffcore.adoc > MAN7_TXT += giteveryday.adoc > MAN7_TXT += gitfaq.adoc > MAN7_TXT += gitglossary.adoc > +MAN7_TXT += gitmergeconflicts.adoc This unfortunately needs to be accompanied with a matching change to help the other build system. You probably want to move your change to set conflict-marker-size for this new file to this step, not at the end as if an afterthought. Documentation/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git c/Documentation/meson.build w/Documentation/meson.build index 51647957e0..10b0637991 100644 --- c/Documentation/meson.build +++ w/Documentation/meson.build @@ -201,6 +201,7 @@ manpages = { 'giteveryday.adoc' : 7, 'gitfaq.adoc' : 7, 'gitglossary.adoc' : 7, + 'gitmergeconflicts.adoc' : 7, 'gitpacking.adoc' : 7, 'gitmergeconflicts.adoc' : 7, 'gitnamespaces.adoc' : 7,