)]}'
{
  "commit": "62fdec17a111e419b750938d24b6d65e3076b76d",
  "tree": "1d7b504f8540a3927e1bca23e99a42eb362c9b4a",
  "parents": [
    "991bbdcab94d93c2a325c4ce74cff139f0f49d97"
  ],
  "author": {
    "name": "Elijah Newren",
    "email": "newren@gmail.com",
    "time": "Fri Jan 01 02:34:43 2021 +0000"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon Jan 04 10:40:45 2021 -0800"
  },
  "message": "merge-ort: flesh out implementation of handle_content_merge()\n\nThis implementation is based heavily on merge_mode_and_contents() from\nmerge-recursive.c, though it has some fixes for recursive merges (i.e.\nwhen call_depth \u003e 0), and has a number of changes throughout based on\nslight differences in data structures and in how the functions are\ncalled.\n\nIt is, however, based on two new helper functions -- merge_3way() and\nmerge_submodule -- for which we only provide die-not-implemented stubs\nat this point.  Future commits will add implementations of these\nfunctions.\n\nSigned-off-by: Elijah Newren \u003cnewren@gmail.com\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "47e230fe341b2f8421099728e3e2b245f52d0d44",
      "old_mode": 33188,
      "old_path": "merge-ort.c",
      "new_id": "2cfb7ffa3b0d51ec55e439677608bfcec59178e6",
      "new_mode": 33188,
      "new_path": "merge-ort.c"
    }
  ]
}