mergetools / gvimdiff2on commit sha1_name: convert disambiguate_hint_fn to take object_id (d2b7d9c)
   1. "$MERGE_TOOLS_DIR/vimdiff"