)]}'
{
  "commit": "eac5a401512181cd315a1031af2b8a25430e335a",
  "tree": "246e7b22c653c94af9a0cd615281b92e39fda902",
  "parents": [
    "0cf8581e330e7140c9f5c94a53d441187c0f8ff9"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Sun Aug 31 19:32:40 2008 -0700"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Sun Aug 31 20:09:21 2008 -0700"
  },
  "message": "checkout --conflict\u003d\u003cstyle\u003e: recreate merge in a non-default style\n\nThis new option does essentially the same thing as -m option when checking\nunmerged paths out of the index, but it uses the specified style instead\nof configured merge.conflictstyle.\n\nSetting \"merge.conflictstyle\" to \"diff3\" is usually less useful than using\nthe default \"merge\" style, because the latter allows a conflict that\nresults by both sides changing the same region in a very similar way to\nget simplified substancially by reducing the common lines.  However, when\none side removed a group of lines (perhaps a function was moved to some\nother file) while the other side modified it, the default \"merge\" style\ndoes not give any clue as to why the hunk is left conflicting.  You would\nneed the original to understand what is going on.\n\nThe recommended use would be not to set merge.conflictstyle variable so\nthat you would usually use the default \"merge\" style conflict, and when\nthe result in a path in a particular merge is too hard to understand, use\n\"git checkout --conflict\u003ddiff3 $path\" to check it out with the original to\nreview what is going on.\n\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "c884862e2fb91831c3962599507b4034d4bcb77e",
      "old_mode": 33188,
      "old_path": "Documentation/git-checkout.txt",
      "new_id": "13b106d6264686da90a543d9a84670348eba6939",
      "new_mode": 33188,
      "new_path": "Documentation/git-checkout.txt"
    },
    {
      "type": "modify",
      "old_id": "b957193155f799ebea0cabcc7496408d4d96d599",
      "old_mode": 33188,
      "old_path": "builtin-checkout.c",
      "new_id": "79214327b0d99369b3ce384ed1900342f5874c87",
      "new_mode": 33188,
      "new_path": "builtin-checkout.c"
    },
    {
      "type": "modify",
      "old_id": "1d4ff6e8d30ce49a2792107be1c23a66b1df3a8b",
      "old_mode": 33261,
      "old_path": "t/t7201-co.sh",
      "new_id": "ac49311cf2c845475eed00ce5b7d8f364770d1c4",
      "new_mode": 33261,
      "new_path": "t/t7201-co.sh"
    }
  ]
}