3 ms·

I think most folks like a graphical merge tool, such as opendiff, or at least that's what I've been able to glean.