<rsbecker@xxxxxxxxxxxxx> 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).
