mergetools / gvimdiffon commit builtin/am: convert to struct object_id (8c88769)
   1. "$MERGE_TOOLS_DIR/vimdiff"