)]}'
{
  "commit": "5c752935fd1065f4144dd1dc9164404369659bac",
  "tree": "3e9ccc8ab8def4487d36fbd73ad520edc53b63b7",
  "parents": [
    "eefc46f901871c75770bb58c13f6cc063dacbfed"
  ],
  "author": {
    "name": "Alexander Dupuy",
    "email": "alex@dupuy.us",
    "time": "Thu May 07 23:04:15 2015 +0200"
  },
  "committer": {
    "name": "Alexander Dupuy",
    "email": "alex.dupuy@mac.com",
    "time": "Sat May 09 04:29:38 2015 +0200"
  },
  "message": "Refactor check-merge-conflicts tests\n\nDo a straight test of detecting a real merge conflict as generated by git.\nTest artificial conflict detection while pending merge without a real conflict.\nTest artificial non-conflict non-detection in a resolved merge conflict.\nRename test_does_not_care... function to reflect what we want to care about.\nRename is_in_merge_conflict to is_in_merge since that is what it checks.\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "f8bcadfc8e3a59a458f48bad7f4e7cf3788eaefb",
      "old_mode": 33188,
      "old_path": "pre_commit_hooks/check_merge_conflict.py",
      "new_id": "ec0947349775c9df26a0570ac212db53cc3c807d",
      "new_mode": 33188,
      "new_path": "pre_commit_hooks/check_merge_conflict.py"
    },
    {
      "type": "modify",
      "old_id": "7e31313d9f687b0d00e7002a47e7c1fc18097a08",
      "old_mode": 33188,
      "old_path": "tests/check_merge_conflict_test.py",
      "new_id": "3d719bd317707eeec0440d1e0a814030e9a8d963",
      "new_mode": 33188,
      "new_path": "tests/check_merge_conflict_test.py"
    }
  ]
}