Adding steps for git mergetool