mergetools / gvimdiff2on commit read-cache: fix directory/file conflict handling in read_index_unmerged() (ad37620)
   1. "$MERGE_TOOLS_DIR/vimdiff"