mergetools / gvimdiff3on commit builtin/merge-tree: convert remaining caller of get_sha1 to object_id (d1a35e5)
   1. "$MERGE_TOOLS_DIR/vimdiff"