added external merge tools for mac and linux