mergetools / vimdiff2on commit Merge branch 'nd/completion-aliasfiletype-typofix' (df20b62)
   1. "$MERGE_TOOLS_DIR/vimdiff"