mergetools / gvimdiff2on commit dir: simplify untracked cache "ident" field (0e0f761)
   1. "$MERGE_TOOLS_DIR/vimdiff"