mergetools / vimdiff2on commit Merge branch 'jk/empty-archive' into maint (a9dc3b6)
   1. "$MERGE_TOOLS_DIR/vimdiff"