mergetools / vimdiff2on commit Merge branch 'ds/add-missing-tags' (291123e)
   1. "$MERGE_TOOLS_DIR/vimdiff"