You can link Git up to use any mergetool you want, if you have a specific one in mind. I've seen it used with Perforce visual merge tool, opendiff, kdiff3, etc

You can link Git up to use any mergetool you want, if you have a specific one in mind. I've seen it used with Perforce visual merge tool, opendiff, kdiff3, etc. If you have a tool you like, it's not too difficult to get it setup. See: http://progit.org/book/ch7-1.html#external_merge_and_diff_tools http://progit.org/book/ch7-1.html#external_merge_and_diff_to...