mergetools / gvimdiff3on commit object: convert lookup_object() to use object_id (d0229ab)
   1. "$MERGE_TOOLS_DIR/vimdiff"