Adding pre-stablished merge tool and option to 'git pull' with no args