update to diffmerge, mate as editor