Add aliases for diff/mergetool