Added p4merge as diff tool