mergetools / gvimdiff2on commit Merge branch 'va/i18n-misc-updates' (e5e7a91)
   1. "$MERGE_TOOLS_DIR/vimdiff"