mergetools / gvimdiff3on commit Merge branch 'va/i18n' (1fe6f5f)
   1. "$MERGE_TOOLS_DIR/vimdiff"