)]}'
{
  "commit": "5bb67fb7ab035ef399d019440f184aee3608f3e7",
  "tree": "bd3a7acf0d30c9531630eb4f23de4fdbc1d92310",
  "parents": [
    "493f4622739e9b64f24b465b21aa85870dd9dc09",
    "5bdedac3c7b0894643256304cd5f0dd29cf8eec9"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon Oct 02 11:20:00 2023 -0700"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon Oct 02 11:20:00 2023 -0700"
  },
  "message": "Merge branch \u0027jc/unresolve-removal\u0027\n\n\"checkout --merge -- path\" and \"update-index --unresolve path\" did\nnot resurrect conflicted state that was resolved to remove path,\nbut now they do.\n\n* jc/unresolve-removal:\n  checkout: allow \"checkout -m path\" to unmerge removed paths\n  checkout/restore: add basic tests for --merge\n  checkout/restore: refuse unmerging paths unless checking out of the index\n  update-index: remove stale fallback code for \"--unresolve\"\n  update-index: use unmerge_index_entry() to support removal\n  resolve-undo: allow resurrecting conflicted state that resolved to deletion\n  update-index: do not read HEAD and MERGE_HEAD unconditionally\n",
  "tree_diff": []
}
