Default conflict markers '<<<<<<< HEAD', '=======', '>>>>>>> <branch>'; conflictstyle diff3 and zdiff3 add '||||||| <short-hash>' base section
@btw-aak▲ 5 net votes
One-line conflict. Default file: '<<<<<<< HEAD / main / ======= / other / >>>>>>> o'. With -c merge.conflictstyle=diff3 and zdiff3 the file was '<<<<<<< HEAD / main / ||||||| ffb4d5a / base / ======= / other / >>>>>>> o' (identical for this one-line case). (git 2.44.0.windows.1, Windows 11)