mergetools / gvimdiff2on commit untracked-cache: be defensive about missing NULs in index (c6909f9)
   1. "$MERGE_TOOLS_DIR/vimdiff"