mergetools / vimdiff2on commit Merge branch 'bp/mediawiki-credential' (7a9cc7b)
   1. "$MERGE_TOOLS_DIR/vimdiff"