add diffmerge alias