From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 15 Apr 2025 20:50:17 +0000 (-0700)
Subject: Merge branch 'pw/custom-conflict-marker-size-for-merge-related-docs'
X-Git-Tag: v2.50.0-rc0~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11e4c8cd9c14dbf9d561928a6ada5a79a3b6c17a;p=thirdparty%2Fgit.git

Merge branch 'pw/custom-conflict-marker-size-for-merge-related-docs'

"git-merge-file" documentation source, which has lines that look
like conflict markers, lacked custom conflict marker size defined,
which has been corrected..

* pw/custom-conflict-marker-size-for-merge-related-docs:
  merge-file doc: set conflict-marker-size attribute
---

11e4c8cd9c14dbf9d561928a6ada5a79a3b6c17a