4 ms·Yeah, it's one of the first things I change in .gitconfig or .hgrc: [merge] conflictstyle = diff3by loeg 4y agoYeah, it's one of the first things I change in .gitconfig or .hgrc: [merge] conflictstyle = diff3pabs3 4y agoThe git zdiff3 conflictstyle is a newer better version of diff3.loeg 4y agoCool.