mergetools / gvimdiff2on commit combine-diff: convert diff_tree_combined to struct object_id (b9acf54)
   1. "$MERGE_TOOLS_DIR/vimdiff"