mergetools / vimdiff2on commit Merge branch 'mm/mediawiki-https-fail-message' (f1e7414)
   1. "$MERGE_TOOLS_DIR/vimdiff"