_cell_marker_format yields incorrect styles

[mlucool]

nbdime/nbdime/merging/strategies.py

Line 238 in 524aac2

return '<span style="color:red">**{0}**</span>'.format(text)

leads to incorrect styling (not bolded as intended) for <<<<<<< local I believe this is because of the following open tag <. It seems like we should instead use <b> tag.

As a note ======= does not look bold because the bolded version seems to just different placed. In the following image, the right pair is "bolded":

Should we instead set a font size? This is 1.5em, not bold (style="color:red; font-size: 1.5em"):

OS: Windows
Browser: Chrome 104
JupyterLab: 3.4.3

[mlucool]

CC @vidartf in case you have any thoughts before I make a PR

[vidartf]

@mlucool It used to work well (#347) but I guess something changed in the markdown renderer? Using <b> is probably the best option, yes. I was wondering to myself if there was some good reason why ** was used rather than <b> in the first place, but I can't remember/think of anything, and can't find anything in git history, so please go ahead! 👍