mergetools / gvimdiff3on commit bulk-checkin.c: convert to use struct object_id (fa33c3a)
   1. "$MERGE_TOOLS_DIR/vimdiff"