mergetools / gvimdiffon commit refs: convert dwim_ref and expand_ref to struct object_id (cca5fa6)
   1. "$MERGE_TOOLS_DIR/vimdiff"