mergetools / gvimdiff3on commit revision: convert prepare_show_merge to struct object_id (68ab61d)
   1. "$MERGE_TOOLS_DIR/vimdiff"