)]}'
{
  "commit": "19c6a4f8369f37c0df1fb57008a891eb6a6dc4bb",
  "tree": "931a497c32219630e51ff1efc333150343333bde",
  "parents": [
    "703e6e76a14825e5b0c960d525f34e607154b4f7"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Thu Jan 21 16:38:56 2010 -0800"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Thu Jan 21 17:02:30 2010 -0800"
  },
  "message": "merge-recursive: do not return NULL only to cause segfault\n\nmerge-recursive calls write_tree_from_memory() to come up with a virtual\ntree, with possible conflict markers inside the blob contents, while\nmerging multiple common ancestors down.  It is a bug to call the function\nwith unmerged entries in the index, even if the merge to come up with the\ncommon ancestor resulted in conflicts.  Otherwise the result won\u0027t be\nexpressible as a tree object.\n\nWe _might_ want to suggest the user to set GIT_MERGE_VERBOSITY to 5 and\nre-run the merge in the message.  At least we will know which part of\nprocess_renames() or process_entry() functions is not correctly handling\nthe unmerged paths, and it might help us diagnosing the issue.\n\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "dd4fbd0e6bc22f2e5f5667205b47165f8aebbbd0",
      "old_mode": 33188,
      "old_path": "merge-recursive.c",
      "new_id": "22a31ed5ff5d1affd54da43769a3982ba2ec1b75",
      "new_mode": 33188,
      "new_path": "merge-recursive.c"
    }
  ]
}