mergetools / vimdiff2on commit Merge branch 'dl/warn-tagging-a-tag' (1294160)
   1. "$MERGE_TOOLS_DIR/vimdiff"