Mac visual diff tool -merge