)]}'
{
  "commit": "e9d221b0b70869fa770e95acf143149c0b8705f6",
  "tree": "dc21f0447a02b19bf22035026a43dc8d3a0c81ba",
  "parents": [
    "d8942ac494fb08b5b99a3eb6fb6a2853a0232d21"
  ],
  "author": {
    "name": "Julia Evans",
    "email": "julia@jvns.ca",
    "time": "Wed Oct 15 13:13:31 2025 +0000"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Wed Oct 15 13:17:52 2025 -0700"
  },
  "message": "doc: git-pull: clarify how to exit a conflicted merge\n\nFrom user feedback:\n\n- One user is confused about why `git reset --merge`\n  (why not just `git reset`?). Handle this by mentioning\n  `git merge --abort` and `git reset --abort` instead, which have a\n  more obvious meaning.\n- 2 users want to know what \"In older versions of Git\" means exactly\n  (in versions older than 1.7.0). Handle this by removing the warning\n  since it was added 15 years ago (in 3f8fc184c0e2c)\n\nSigned-off-by: Julia Evans \u003cjulia@jvns.ca\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "273172aa8036b5d6f41b30e28ca2230a51196356",
      "old_mode": 33188,
      "old_path": "Documentation/git-pull.adoc",
      "new_id": "cd3bbc90e3008d73f8d6bdde97da8b68e84f16a8",
      "new_mode": 33188,
      "new_path": "Documentation/git-pull.adoc"
    }
  ]
}
