)]}'
{
  "commit": "9f94cdc030be6d5256bd64efaa4c56ac96938228",
  "tree": "24f047624c831b31f40e427060c7687b04db7ebe",
  "parents": [
    "31a0405ce61dcd7a50c3974507b5d9aa659beef5"
  ],
  "author": {
    "name": "TheOneKevin",
    "email": "kevindai02@outlook.com",
    "time": "Sun Dec 13 18:58:01 2020 -0500"
  },
  "committer": {
    "name": "TheOneKevin",
    "email": "kevindai02@outlook.com",
    "time": "Sun Dec 13 18:58:01 2020 -0500"
  },
  "message": "Merge conflict\n\n",
  "tree_diff": [
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "09059a5cea7097c8c24ca77cb2d477b41f864e6d",
      "new_mode": 33188,
      "new_path": "macros/bm/sram_1rw1r_32_256_8_sky130.v"
    },
    {
      "type": "modify",
      "old_id": "3ab627215551b9fd1de58f209f425ec97705d8d7",
      "old_mode": 33188,
      "old_path": "verilog/dv/caravel/user_proj_example/io_ports/Makefile",
      "new_id": "2c6407da5796442b9bfffeedc8d2ce27594b27a9",
      "new_mode": 33188,
      "new_path": "verilog/dv/caravel/user_proj_example/io_ports/Makefile"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "931dc5fa97bd152a01f372af440f8093fb0c1531",
      "new_mode": 33188,
      "new_path": "verilog/dv/caravel/user_proj_example/io_ports/io_ports.hex"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "b0472cd519d6cebaaff449636baa292c3d6b9936",
      "new_mode": 33188,
      "new_path": "verilog/dv/caravel/user_proj_example/io_ports/io_ports.vcd"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "5dfca2fbad14b57a4ea9782dad521912168023d1",
      "new_mode": 33188,
      "new_path": "verilog/dv/caravel/user_proj_example/la_test1/la_test1.hex"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "34075a5ce4a0f159db6c8d2c2bb510d5cb509839",
      "new_mode": 33188,
      "new_path": "verilog/dv/caravel/user_proj_example/la_test2/la_test2.hex"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
      "new_mode": 33188,
      "new_path": "verilog/dv/caravel/user_proj_example/verify.log"
    },
    {
      "type": "modify",
      "old_id": "7822e738bc8a67be3cc7adfbd94b1ee3b6ff9d52",
      "old_mode": 33188,
      "old_path": "verilog/rtl/hs32_user_proj/hs32_wrapper.v",
      "new_id": "b51371863ff4cacf2aad47f2c9518327d9244f68",
      "new_mode": 33188,
      "new_path": "verilog/rtl/hs32_user_proj/hs32_wrapper.v"
    }
  ]
}