Johannes Sixt <j6t@xxxxxxxx> writes: > Does > > `-1`, `--base`:: > `-2`, `--ours`:: > `-3`, `--theirs`:: > > not work? (I think we agree that grouping synonyms should be done and > not all tokens moved onto a flat line.) With the current -1 --base:: -2 --ours:: -3 --theirs:: body text these are coalesced into a single header and get rendered as -1 --base, -2 --ours, -3 --theirs body text which reasonably shows that 1 and base belong to the same family that is different from 2 and ours, etc. With an explicit comma in between 1 and base, would we end up with -1, --base, -2, --ours, -3, --theirs which may be worse than what we have currently? Thanks.