3 ms·I know many people who like p4merge and have used it as their mergetool in gitby chrisweekly 2y agoI know many people who like p4merge and have used it as their mergetool in git