mergetools / gvimdiff2on commit tree-walk: store object_id in a separate member (ea82b2a)
   1. "$MERGE_TOOLS_DIR/vimdiff"