added an alias for git-diffmerge