mergetools / gvimdiff3on commit Merge branch 'mm/mediawiki-encoding-fix' (e379831)
   1. "$MERGE_TOOLS_DIR/vimdiff"