)]}'
{
  "commit": "eefc46f901871c75770bb58c13f6cc063dacbfed",
  "tree": "a9dd2175eaf61d36ea65dd1de3f8e42ea844d9c6",
  "parents": [
    "cedcea550c495d536247ca23115035b17074cac7"
  ],
  "author": {
    "name": "Alexander Dupuy",
    "email": "alex@dupuy.us",
    "time": "Thu May 07 18:20:42 2015 +0200"
  },
  "committer": {
    "name": "Alexander Dupuy",
    "email": "alex.dupuy@mac.com",
    "time": "Sat May 09 04:20:38 2015 +0200"
  },
  "message": "Don\u0027t report markup titles as merge conflicts\n\nSeveral markup formats, such as Markdown or Re(Structured)Text\ncan format titles as text with \u0027\u003d\u0027 characters as double underlining,\nlike this:\n```\nMy Page Title\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nLorem ipsum...\n```\n\nRather that considering any line starting with seven \u0027\u003d\u0027 as a conflict marker,\nrequire a space (or line-ending newline) after the equals.\nThis could still create a false positive for a seven character title,\nlike \"Problem\", but the markup formats generally allow extra \u0027\u003d\u0027 characters,\nso by formatting the text like this:\n```\nProblem\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nNot...\n```\nthese pre-commit warnings can be avoided.\n\nAlso updates the tests to add newlines for more realistic conflict files\n(while a file might not end with a newline, conflict markers will).\nPrevent false negative on test_does_not_care_when_not_in_a_conflict()\nby making sure that README.md contains a line identical to a conflict string\n(exactly seven \u0027\u003d\u0027 followed by a newline).\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "5e274a3f827dbd09803db25b8217e4cc47eb96e3",
      "old_mode": 33188,
      "old_path": "pre_commit_hooks/check_merge_conflict.py",
      "new_id": "f8bcadfc8e3a59a458f48bad7f4e7cf3788eaefb",
      "new_mode": 33188,
      "new_path": "pre_commit_hooks/check_merge_conflict.py"
    },
    {
      "type": "modify",
      "old_id": "f3bd935fe2a48d22c0b5fd23cb65ed8832b07983",
      "old_mode": 33188,
      "old_path": "tests/check_merge_conflict_test.py",
      "new_id": "7e31313d9f687b0d00e7002a47e7c1fc18097a08",
      "new_mode": 33188,
      "new_path": "tests/check_merge_conflict_test.py"
    }
  ]
}