From: Junio C Hamano <gitster@pobox.com>
To: <rsbecker@nexbridge.com>
Cc: "'Nicholas Bransby-Williams'" <nbransby@gmail.com>,
<git@vger.kernel.org>
Subject: Re: conflict markers in markdown files
Date: Thu, 28 Oct 2021 22:08:05 -0700 [thread overview]
Message-ID: <xmqq5ytgo1u2.fsf@gitster.g> (raw)
In-Reply-To: <00c601d7cc53$0ce58800$26b09800$@nexbridge.com> (rsbecker@nexbridge.com's message of "Thu, 28 Oct 2021 19:25:04 -0400")
<rsbecker@nexbridge.com> writes:
> 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).
prev parent reply other threads:[~2021-10-29 5:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-28 14:00 conflict markers in markdown files Nicholas Bransby-Williams
2021-10-28 15:38 ` Philip Oakley
2021-10-28 19:54 ` Junio C Hamano
2021-10-28 20:33 ` Nicholas Bransby-Williams
2021-10-28 22:28 ` Junio C Hamano
2021-10-28 22:49 ` Nicholas Bransby-Williams
2021-10-28 23:11 ` Junio C Hamano
2021-10-28 23:25 ` rsbecker
2021-10-29 5:08 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq5ytgo1u2.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=nbransby@gmail.com \
--cc=rsbecker@nexbridge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.