4 ms·kdiff3 for merge conflicts is nice (I think)by whycombagator 7y agokdiff3 for merge conflicts is nice (I think)