)]}'
{
  "commit": "8e66f69e430629269ba9defd089f32702b4b06ff",
  "tree": "7ad2d61bf407ae835ed5f69fb1ff451cdd892aed",
  "parents": [
    "30f0c6c4b1a1ff21d1ab574f6af95ea0f67873b4",
    "60826fdeb137a61e6ae8b80d70509d2bc094f8a5"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Sat Jun 13 09:22:46 2026 -0700"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Sat Jun 13 09:22:46 2026 -0700"
  },
  "message": "Merge branch \u0027en/ort-harden-against-corrupt-trees\u0027 into jch\n\n\"ort\" merge backend handles merging corrupt trees better by\naborting when it should.\n\n* en/ort-harden-against-corrupt-trees:\n  cache-tree: fix verify_cache() to catch non-adjacent D/F conflicts\n  merge-ort: abort merge when trees have duplicate entries\n  merge-ort: free diff pairs queue in clear_or_reinit_internal_opts()\n  merge-ort: drop unnecessary show_all_errors from collect_merge_info()\n  merge-ort: propagate callback errors from traverse_trees_wrapper()\n",
  "tree_diff": []
}
