)]}'
{
  "commit": "890fca84be9d2419939f64872648ebe79e68a0b2",
  "tree": "9c805fa721b2da244619ecfee91dd87de5d38b67",
  "parents": [
    "0ce02b362078efe3e3511feb55d2cb5f8e751961"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon Mar 28 14:48:13 2016 -0700"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Wed Apr 06 15:54:41 2016 -0700"
  },
  "message": "rerere: adjust \u0027forget\u0027 to multi-variant world order\n\nBecause conflicts with the same contents inside conflict blocks\nenclosed by \"\u003c\u003c\u003c\u003c\u003c\u003c\u003c\" and \"\u003e\u003e\u003e\u003e\u003e\u003e\u003e\" can now have multiple variants\nto help three-way merge to adjust to the differences outside the\nconflict blocks, \"rerere forget $path\" needs to be taught that there\nmay be multiple recorded resolutions that share the same conflict\nhash (which groups the conflicts with \"the same contents inside\nconflict blocks\"), among which there are some that would not be\nrelevant to the conflict we are looking at.  These \"other variants\"\nthat happen to share the same conflict hash should not be cleared,\nand the variant that would apply to the current conflict may not be\nthe zero-th one (which is the only one that is cleared by the\ncurrent code).\n\nAfter finding the conflict hash, iterate over the existing variants\nand try to resolve the conflict using each of them to find the one\nthat \"cleanly\" resolves the current conflict.  That is the one we\nwant to forget and record the preimage for, so that the user can\nrecord the corrected resolution.\n\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "e636d4b0fb84a510c6dbac11afcc199c86384670",
      "old_mode": 33188,
      "old_path": "rerere.c",
      "new_id": "16938662dd4152f2d9bfaac31b9715209c3bbd51",
      "new_mode": 33188,
      "new_path": "rerere.c"
    },
    {
      "type": "modify",
      "old_id": "a85fc7d42ceb796289fd3d6332d63f6dc69d134d",
      "old_mode": 33261,
      "old_path": "t/t4200-rerere.sh",
      "new_id": "1a080e782371e2d7ad489c706a54fce1553b9579",
      "new_mode": 33261,
      "new_path": "t/t4200-rerere.sh"
    }
  ]
}