Added functions to set p4merge as merge tool