)]}'
{
  "commit": "2a22c1b35d6110e72d86a2fac4b68dbad0905adb",
  "tree": "d4edcb49da9517972f8d11911acb80799e3f0b39",
  "parents": [
    "618cd75707580819f19a5f01dba406ac72219c78"
  ],
  "author": {
    "name": "Johan Herland",
    "email": "johan@herland.net",
    "time": "Tue Nov 09 22:49:58 2010 +0100"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Wed Nov 17 13:23:55 2010 -0800"
  },
  "message": "cmd_merge(): Parse options before checking MERGE_HEAD\n\nReorder the initial part of builtin/merge.c:cmd_merge() so that command-line\noptions are parsed _before_ we load the index and check for MERGE_HEAD\n(and exits if it exists). This does not change the behaviour of \u0027git merge\u0027,\nbut is needed in preparation for the implementation of \u0027git merge --abort\u0027\n(which requires MERGE_HEAD to be present).\n\nThis patch has been improved by the following contributions:\n- Junio C Hamano: fixup minor style issues\n\nThanks-to: Junio C Hamano \u003cgitster@pobox.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": "37ce4f589f6582abf0d1ef5bd263f590a16853d5",
      "old_mode": 33188,
      "old_path": "builtin/merge.c",
      "new_id": "478a4921aff4daadd4c9683414754cfebfa12717",
      "new_mode": 33188,
      "new_path": "builtin/merge.c"
    }
  ]
}