2 ms·

I like using Perforce's three-way merge. The only thing confusing is Git's ridiculous naming for remote and local.