Code

git-mergetool: Make default selection of merge-tool more intelligent