mergetools / vimdiff2on commit Merge branch 'cm/remote-mediawiki' (0c36f3a)
   1. "$MERGE_TOOLS_DIR/vimdiff"