Re: [PATCH 1/7] [doc] Add new gitmergeconflicts man page
From: Junio C Hamano <hidden>
Date: 2026-09-24 22:04:43
Junio C Hamano [off-list ref] writes:
This unfortunately needs to be accompanied with a matching change to help the other build system.
I did get a build failure due to meson, but apparently not due to this step in the 7-patch series.
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.
This still stands, though. Sorry, a wrong patch and a false alarm.
quoted hunk ↗ jump to hunk
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,