Add automatic git-mergetool invocation to the new infrastructure