mergetools / gvimdiff3on commit index-pack: detect local corruption in collision check (5105417)
   1. "$MERGE_TOOLS_DIR/vimdiff"