mergetools / gvimdiff2on commit merge-recursive: convert struct stage_data to use object_id (fd429e9)
   1. "$MERGE_TOOLS_DIR/vimdiff"