gitconfig: add alias mergetool
Merge branch 'master' of github.com:RomainGiraud/defix