use diffmerge for diff & merge tool