Make user info an external file
Add difftool and mergetool