Remove 'tm' alias
Disable prompt for mergetool