)]}'
{
  "commit": "d5f4e42f02214b5d5af23578a4ad8de66427840d",
  "tree": "d97f79eea793f155d1782a879495190a6a648d60",
  "parents": [
    "63ea7cd6744b42aa7b62b1694c95a5823de897db"
  ],
  "author": {
    "name": "Phillip Wood",
    "email": "phillip.wood@dunelm.org.uk",
    "time": "Tue Oct 13 16:47:55 2026 +0100"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Tue Oct 13 10:31:06 2026 -0700"
  },
  "message": "merge: remember conflict labels\n\nWhen recreating merge conflicts with \"git checkout -m \u003cpath\u003e\" the\noriginal conflict labels are lost. For commands like \"git merge\" and\n\"git cherry-pick\" we could use the presence of the related root\nref (MERGE_HEAD and CHERRY_PICK_HEAD respectively) to recreate the\nlabels. However, if the conflicts are from \"git stash pop\" or \"git\ncheckout -m \u003cbranch\u003e\", then there is no ref to deduce the labels from. To\nensure the labels are always available, the merge machinery is updated to\nwrite \".git/MERGE_LABELS\" when it updates the worktree and\nthere are conflicts. The labels are then read from that file by \"git\ncheckout -m \u003cpath\u003e\" when recreating the conflicts.\n\nAs \"git checkout -m \u003cbranch\u003e\" calls remove_branch_state() which\nordinarily removes the labels file, we need to pass a flag down\nto optionally prevent that so that the labels are available for any\nsubsequent \"git checkout -m \u003cpath\u003e\". Note that merge_switch_to_result()\nwe assign \"result-\u003epriv\" to \"opt-\u003epriv\" and later clear \"opt-\u003epriv\" in\norder to get a pointer to the private struct as result-\u003epriv is void*.\n\nSigned-off-by: Phillip Wood \u003cphillip.wood@dunelm.org.uk\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "8bc7a395a742ac1cc6178775eb9ed0b0d60f6cc9",
      "old_mode": 33188,
      "old_path": "branch.c",
      "new_id": "5bb1c28915ebfd244f6aeaccb0ce2fde8e52a867",
      "new_mode": 33188,
      "new_path": "branch.c"
    },
    {
      "type": "modify",
      "old_id": "42d1b1291828eb1ec50641bdec5e8da754ee4e45",
      "old_mode": 33188,
      "old_path": "branch.h",
      "new_id": "95b2431f24589539a22f1a6040dc10203a84153c",
      "new_mode": 33188,
      "new_path": "branch.h"
    },
    {
      "type": "modify",
      "old_id": "ac66de23f97f9740ad7b4adc6b8925d881abb70d",
      "old_mode": 33188,
      "old_path": "builtin/checkout.c",
      "new_id": "53a7290fb354c679f5798a3f9a5685b25da0ecd2",
      "new_mode": 33188,
      "new_path": "builtin/checkout.c"
    },
    {
      "type": "modify",
      "old_id": "840b6b4083b945f2710adf6bec58747a459ea498",
      "old_mode": 33188,
      "old_path": "builtin/commit.c",
      "new_id": "884c0915f4840eecd86d03c9fd670487b6544cf2",
      "new_mode": 33188,
      "new_path": "builtin/commit.c"
    },
    {
      "type": "modify",
      "old_id": "c410a5d353234c8018de55f36cfec11142f7ad15",
      "old_mode": 33188,
      "old_path": "merge-ort.c",
      "new_id": "8f720e0d1295f51c1961ea2351678248af9ff269",
      "new_mode": 33188,
      "new_path": "merge-ort.c"
    },
    {
      "type": "modify",
      "old_id": "0f5e823e63ed5fe29c654078f13fc5ad6dee4b61",
      "old_mode": 33188,
      "old_path": "merge.c",
      "new_id": "6a557d11ac57228503832035e98134441bc46aff",
      "new_mode": 33188,
      "new_path": "merge.c"
    },
    {
      "type": "modify",
      "old_id": "21ac7ef2f130eb3be46a46618a488df55812ad53",
      "old_mode": 33188,
      "old_path": "merge.h",
      "new_id": "3d936d6988e9c6f117ff78f9e9dcf1bedd2186c4",
      "new_mode": 33188,
      "new_path": "merge.h"
    },
    {
      "type": "modify",
      "old_id": "c3a709a9284b7ff21703f487ac93e0eaf49f95b8",
      "old_mode": 33188,
      "old_path": "path.c",
      "new_id": "79657626026986bd4e5d9ccf42aa6e3f0ac3e4f7",
      "new_mode": 33188,
      "new_path": "path.c"
    },
    {
      "type": "modify",
      "old_id": "7e7408dd05fce3994c58a0d83bcceb12f56da0d4",
      "old_mode": 33188,
      "old_path": "path.h",
      "new_id": "8cd12ccfde0cd7a8d8cb6f0b8906de941a18e7c0",
      "new_mode": 33188,
      "new_path": "path.h"
    },
    {
      "type": "modify",
      "old_id": "b857e1c580e83e3d7a37b42019dd272c0b1d9dd7",
      "old_mode": 33188,
      "old_path": "repository.c",
      "new_id": "210fb819b0d9cbce97efd530255942826f4f32b2",
      "new_mode": 33188,
      "new_path": "repository.c"
    },
    {
      "type": "modify",
      "old_id": "11f5c2ed10dc3fc446be04a55653d96b25e6285f",
      "old_mode": 33188,
      "old_path": "repository.h",
      "new_id": "91b1f57db7b3bc5701bd5a3977f15a445521c22d",
      "new_mode": 33188,
      "new_path": "repository.h"
    },
    {
      "type": "modify",
      "old_id": "6dae43e4db92aef377006baeff8548fc5908b83f",
      "old_mode": 33188,
      "old_path": "sequencer.c",
      "new_id": "7f76a14e497350a49d1608c77654ac35fe0d6344",
      "new_mode": 33188,
      "new_path": "sequencer.c"
    },
    {
      "type": "modify",
      "old_id": "9ea9462914f74b5008f6e053b63118eb3d1806df",
      "old_mode": 33261,
      "old_path": "t/t7201-co.sh",
      "new_id": "3e9e04738ae8154b7fe48644c231b7e8e84f2417",
      "new_mode": 33261,
      "new_path": "t/t7201-co.sh"
    }
  ]
}