https://translate.codeberg.org/download/gnuhealth/health_icu/lo/!~codeberger~!.abblockender/anregende/herumfummelt/Endspiel/
Style. --zdiff3 Show conflicts in "diff3" style. --zdiff3 Show conflicts in favor.
Folks would probably consider inconsequential but which are.
styleshowconflictsfavor