)]}'
{
  "commit": "ed3789f2f0ab8b8d5e325e47f0caf02b6bd9edfc",
  "tree": "2923c250df14404896089bde6ffa990ea276d66c",
  "parents": [
    "54f98fee5069f50c6e96687504b82a7695c8648a"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon Jul 31 15:44:08 2023 -0700"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon Jul 31 16:13:49 2023 -0700"
  },
  "message": "checkout/restore: add basic tests for --merge\n\nEven though \"checkout --merge -- paths\" had some tests, we never\nmade sure it worked to recreate the conflicted state _after_ the\nresolution was recorded in the index.  Also \"restore --merge\" did\nnot even have any tests.\n\nCurrently these commands use the unmerge_marked_index() interface\nthat cannot handle paths that have been resolved as removal, and\ntests for that case are marked with test_expect_failure; these\nshould eventually be fixed, but not in this patch.\n\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "fd775807e7c9d8b74c7930bb72386e1221fb9cef",
      "old_mode": 33261,
      "old_path": "t/t2070-restore.sh",
      "new_id": "d97ecc2483b4b922b70858aca0c18481d85be376",
      "new_mode": 33261,
      "new_path": "t/t2070-restore.sh"
    },
    {
      "type": "modify",
      "old_id": "23d4dadbcc0a7fe630f0e9ca27d1ce0c07805426",
      "old_mode": 33261,
      "old_path": "t/t7201-co.sh",
      "new_id": "4b07a26c1458aedb9c1bb64dd1fe21c9eaa53178",
      "new_mode": 33261,
      "new_path": "t/t7201-co.sh"
    }
  ]
}