mergetools / vimdiff2on commit upload-pack: ignore 'shallow' lines with unknown obj-ids (af04fa2)
   1. "$MERGE_TOOLS_DIR/vimdiff"