)]}'
{
  "commit": "99d698f1e703754422f1dd780487ddbff3726dc3",
  "tree": "1524e03e8e58318658e8fdf47c31c667d5bd29c6",
  "parents": [
    "a9a3e82e6d0018ff42ec11fd9560c1ff47add824"
  ],
  "author": {
    "name": "Olivier Marin",
    "email": "dkr@freesurf.fr",
    "time": "Mon Jul 07 14:42:48 2008 +0200"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Thu Jul 10 00:17:46 2008 -0700"
  },
  "message": "builtin-rerere: more carefully find conflict markers\n\nWhen a conflicting file contains a line that begin with \"\u003d\u003d\u003d\u003d\u003d\u003d\u003d\", rerere\nfailed to parse conflict markers. This result to a wrong preimage file and\nan unexpected error for the user.  The boundary between ours and theirs\nnot just begin with 7 equals, but is followed by either a SP or a LF.\n\nThis patch enforces parsing rules so that markers match in the right order,\nand when ambiguous, the command does not autoresolve the conflicted file.\n\nEspecially because we are introducing rerere.autoupdate configuration\n(which is off by default for safety) that automatically stages the\nresolution made by rerere, it is necessary to make sure that we do not\nautoresolve when there is any ambiguity.\n\nSigned-off-by: Olivier Marin \u003cdkr@freesurf.fr\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "839b26e8e0a10a498a81bf27d907543e7c256cb8",
      "old_mode": 33188,
      "old_path": "builtin-rerere.c",
      "new_id": "69c3a52d5e98818dcd4407e75ae9cfff938710a6",
      "new_mode": 33188,
      "new_path": "builtin-rerere.c"
    },
    {
      "type": "modify",
      "old_id": "a64727d5ad00cb222e3020b6702e4f89e212039c",
      "old_mode": 33261,
      "old_path": "t/t4200-rerere.sh",
      "new_id": "cf10557dd277cbd221c69fb42add15e956c1793b",
      "new_mode": 33261,
      "new_path": "t/t4200-rerere.sh"
    }
  ]
}