4 ms·The git zdiff3 conflictstyle is a newer better version of diff3.by pabs3 4y agoThe git zdiff3 conflictstyle is a newer better version of diff3.loeg 4y agoCool.