Re:Mergiraf: a syntax-aware merge driver for Git
by masklinn on Saturday November 09, 2024 @08:32AM
(#42094317)
FWIW your examples are very unclear as they use text formatting, you need to indent lines by 4 spaces (with an empty line before and after) for a code block e.g.
if a == b: print("x")
versus