mergetools / gvimdiffon commit Merge branch 'mm/config-intro-in-git-doc' (48050fb)
   1. "$MERGE_TOOLS_DIR/vimdiff"