)]}'
{
  "commit": "d5af51053cd060d7a4893f030626b04351554d1b",
  "tree": "b9d94c906c213c3ddb8f6cade1d96815fcce006c",
  "parents": [
    "22da742982eeeb95b6fb4cd757509a8c4c2202d8"
  ],
  "author": {
    "name": "Schalk, Ken",
    "email": "ken.schalk@intel.com",
    "time": "Wed Sep 01 13:15:32 2010 -0700"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Fri Sep 03 11:26:49 2010 -0700"
  },
  "message": "RE: [PATCH] Avoid rename/add conflict when contents are identical\n\n\u003eDue to this this (and maybe all the tests) need to depend on the\n\u003eSYMLINKS prereq.\n\nHere\u0027s a third attempt with no use of symlinks in the test:\n\nSkip the entire rename/add conflict case if the file added on the\nother branch has the same contents as the file being renamed.  This\navoids giving the user an extra copy of the same file and presenting a\nconflict that is confusing and pointless.\n\nA simple test of this case has been added in\nt/t3030-merge-recursive.sh.\n\nSigned-off-by: Ken Schalk \u003cken.schalk@intel.com\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "fb6aa4a551802de07be76bd838b6f22a236457ff",
      "old_mode": 33188,
      "old_path": "merge-recursive.c",
      "new_id": "a2fba84d9d3d1aab5deb10ff1074b065b2a54047",
      "new_mode": 33188,
      "new_path": "merge-recursive.c"
    },
    {
      "type": "modify",
      "old_id": "d541544537d47587abad8d27565cf9197387cfd6",
      "old_mode": 33261,
      "old_path": "t/t3030-merge-recursive.sh",
      "new_id": "df234f144a5f72c85f95ec6d3c218f70eebecfc8",
      "new_mode": 33261,
      "new_path": "t/t3030-merge-recursive.sh"
    }
  ]
}