diffmerge as merge tool