)]}'
{
  "commit": "b26dc1274c00cea4e35b6ca2e5e360f363ba23b4",
  "tree": "085eb868de6bd72cb8097f52011c3e649ec0608c",
  "parents": [
    "ad72032c8db3c5bf73e00a7e2cf4e257b652dabf",
    "d5f4e42f02214b5d5af23578a4ad8de66427840d"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Thu Oct 22 07:23:15 2026 -0700"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Thu Oct 22 07:23:16 2026 -0700"
  },
  "message": "Merge branch \u0027pw/checkout-m-conflict-labels\u0027\n\nWhen recreating a merge conflict using \u0027git checkout -m\u0027, the\noriginal conflict labels (such as branch names) were lost and\nreplaced with generic ones.  The merge machinery has been updated to\nrecord the original labels in \u0027.git/MERGE_LABELS\u0027, allowing \u0027git\ncheckout -m\u0027 to restore them.\n\n* pw/checkout-m-conflict-labels:\n  merge: remember conflict labels\n  checkout -m \u003cpath\u003e: cache merge settings\n  remove_branch_state: convert boolean argument to flags\n",
  "tree_diff": []
}