Updated mergetool setting in ~/.gitconfig (keep backups!)
Added a user-defined command for Man and Mans, and the corresponding lowercase abbreviations