Added external diff and merge tools from official documentation to use with p4merge