Re: conflict markers in markdown files

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 29, 2021, 05:08 UTC
Message-ID: <xmqq5ytgo1u2.fsf@gitster.g>
In-Reply-To: <00c601d7cc53$0ce58800$26b09800$@nexbridge.com>

<rsbecker@nexbridge.com> writes:

Show 7 quoted lines

> It sounds like we might need an attribute like:
>
> *.md	conflict-marker-size=32,conflict-marker-separator='~'
>
> to stick 32 ~ characters as a separator, if going down that path. I'm not
> sure how hard this would be, but tooling other systems, like JGit and every
> client on the planet would be painful.

Well, the underline-style markdown headers can use tilde for headers below the level that uses hyphens, so you'd need to pick a different separator letter ;-). I agree that third-party application would have trouble with an arbitrary setting of the marker appearance (note that our own "rerere" knows about the attribute).