)]}'
{
  "commit": "35d2fffdb857836cc46f5a4ada525a246ddd5e11",
  "tree": "13a36b77e543efdcf0915f977d8fa23c3d7b3fe9",
  "parents": [
    "2a22c1b35d6110e72d86a2fac4b68dbad0905adb"
  ],
  "author": {
    "name": "Johan Herland",
    "email": "johan@herland.net",
    "time": "Tue Nov 09 22:49:59 2010 +0100"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Wed Nov 17 13:23:55 2010 -0800"
  },
  "message": "Provide \u0027git merge --abort\u0027 as a synonym to \u0027git reset --merge\u0027\n\nTeach \u0027git merge\u0027 the --abort option, which verifies the existence of\nMERGE_HEAD and then invokes \u0027git reset --merge\u0027 to abort the current\nin-progress merge and attempt to reconstruct the pre-merge state.\n\nThe reason for adding this option is to provide a user interface for\naborting an in-progress merge that is consistent with the interface\nfor aborting a rebase (\u0027git rebase --abort\u0027), aborting the application\nof a patch series (\u0027git am --abort\u0027), and aborting an in-progress notes\nmerge (\u0027git notes merge --abort\u0027).\n\nThe patch includes documentation and testcases that explain and verify\nthe various scenarios in which \u0027git merge --abort\u0027 can run. The\ntestcases also document the cases in which \u0027git merge --abort\u0027 is\nunable to correctly restore the pre-merge state (look for the \u0027###\u0027\ncomments towards the bottom of t/t7609-merge-abort.sh).\n\nThis patch has been improved by the following contributions:\n- Jonathan Nieder: Move test documentation into test_description\n\nThanks-to: Jonathan Nieder \u003cjrnieder@gmail.com\u003e\nSigned-off-by: Johan Herland \u003cjohan@herland.net\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "84043cc5b26db7d34c93a70ec005df913c345d85",
      "old_mode": 33188,
      "old_path": "Documentation/git-merge.txt",
      "new_id": "47b59a551d60a5445a65bdcc2450d1f3cde04134",
      "new_mode": 33188,
      "new_path": "Documentation/git-merge.txt"
    },
    {
      "type": "modify",
      "old_id": "478a4921aff4daadd4c9683414754cfebfa12717",
      "old_mode": 33188,
      "old_path": "builtin/merge.c",
      "new_id": "0539f7c91289a5707330391424a81d8ba3ba7df9",
      "new_mode": 33188,
      "new_path": "builtin/merge.c"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "61890bc892d9fd37032f9ca05eab87de0e0dda03",
      "new_mode": 33261,
      "new_path": "t/t7609-merge-abort.sh"
    }
  ]
}