)]}'
{
  "commit": "03c4829347e26c844e589c61567a77a77c0658a9",
  "tree": "710bb9fe8949675c82c5f90050fabea72026112c",
  "parents": [
    "5832d1a9da78273652c213d8e1535c09dd7dc079"
  ],
  "author": {
    "name": "Johannes Sixt",
    "email": "j6t@kdbg.org",
    "time": "Mon Dec 15 11:05:30 2008 +0100"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Sun Dec 21 01:08:37 2008 -0800"
  },
  "message": "Show a failure of rebase -p if the merge had a conflict\n\nThis extends t3409-rebase-preserve-merges by a case where the merge that\nis rebased has a conflict. Therefore, the rebase stops and expects that\nthe user resolves the conflict. However, currently rebase --continue\nfails because .git/rebase-merge/author-script is missing.\n\nThe test script had allocated two identical clones, but only one of them\n(clone2) was used. Now we use both as indicated in the comment. Also,\ntwo instances of \u0026\u0026 was missing in the setup part.\n\nSigned-off-by: Johannes Sixt \u003cj6t@kdbg.org\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "8cde40f8e80b5df9e8ebf1cd66cd196817107cd4",
      "old_mode": 33261,
      "old_path": "t/t3409-rebase-preserve-merges.sh",
      "new_id": "5ddd1d1a93c74fe81da142f07a659c75e3fd9e7c",
      "new_mode": 33261,
      "new_path": "t/t3409-rebase-preserve-merges.sh"
    }
  ]
}