mergetools / gvimdiff2on commit Merge branch 'ja/l10n-fixes' (c2a8c37)
   1. "$MERGE_TOOLS_DIR/vimdiff"