3 ms·Or use my favourite conflict program p4mergeby skeletonjelly 13y agoOr use my favourite conflict program p4merge