Using diffmerge for my merge tool