)]}'
{
  "commit": "faaab8d571633fc8d98f58f02862f1d0bfa988f7",
  "tree": "e7640a245227c1cf97bf49298c03776d6a8e529d",
  "parents": [
    "326e5bc91eecf73234ead29636207bc516573e79"
  ],
  "author": {
    "name": "David Aguilar",
    "email": "davvid@gmail.com",
    "time": "Wed Mar 09 23:13:58 2016 -0800"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Thu Mar 10 14:07:13 2016 -0800"
  },
  "message": "mergetool: support delete/delete conflicts\n\nIf two branches each move a file into different directories then\nmergetool will fail because it assumes that the file being merged, and\nits parent directory, are present in the worktree.\n\nCreate the merge file\u0027s parent directory to allow using the\ndeleted base version of the file for merge resolution when\nencountering a delete/delete conflict.\n\nThe end result is that a delete/delete conflict is presented for the\nuser to resolve.\n\nReported-by: Joe Einertson \u003cjoe@kidblog.org\u003e\nSigned-off-by: David Aguilar \u003cdavvid@gmail.com\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "9f77e3a8bb0b1197f860912b6d0e56b40b607cb9",
      "old_mode": 33261,
      "old_path": "git-mergetool.sh",
      "new_id": "b06ae787393c9ee94b82b26dbac028cec777a56b",
      "new_mode": 33261,
      "new_path": "git-mergetool.sh"
    },
    {
      "type": "modify",
      "old_id": "6f12b235b3a9330497e814d5e8f564aec94d0c44",
      "old_mode": 33261,
      "old_path": "t/t7610-mergetool.sh",
      "new_id": "39469d96d42dff5983f06059155fe2048a0b95bb",
      "new_mode": 33261,
      "new_path": "t/t7610-mergetool.sh"
    }
  ]
}
