3 ms·SmartGIT is not bad either and it includes a decent three way merge tool.by WayneDB 15y agoSmartGIT is not bad either and it includes a decent three way merge tool.