)]}'
{
  "commit": "44e7efa34a423fe26455860026602715a9b32744",
  "tree": "2e3f3a3d59a29f6aa55807b659eb8ef81eb22dd7",
  "parents": [
    "63e4211b992f74694878f553388f3f7c89b9cd11"
  ],
  "author": {
    "name": "Tim Edwards",
    "email": "tim@opencircuitdesign.com",
    "time": "Fri Aug 20 13:20:55 2021 -0400"
  },
  "committer": {
    "name": "Tim Edwards",
    "email": "tim@opencircuitdesign.com",
    "time": "Fri Aug 20 13:20:55 2021 -0400"
  },
  "message": "Resolved merge conflict of sky130/Makefile.in\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "89f929f3a2d1383819c530963fa8e853b698ad8a",
      "old_mode": 33188,
      "old_path": "README.md",
      "new_id": "e5d34aef9c5c2195606715cf7598978e1ce5d9bc",
      "new_mode": 33188,
      "new_path": "README.md"
    },
    {
      "type": "modify",
      "old_id": "52dad2e705d11fb1931916bee75cc24317f123ca",
      "old_mode": 33261,
      "old_path": "common/staging_install.py",
      "new_id": "be8d9e3124ec73617bed65a3c67987bcd1daa891",
      "new_mode": 33261,
      "new_path": "common/staging_install.py"
    },
    {
      "type": "modify",
      "old_id": "80d66e5f995e77136c441e407961c0318528dc90",
      "old_mode": 33261,
      "old_path": "scripts/configure",
      "new_id": "aed9348b6bb4317ed366427ff012085238c5265d",
      "new_mode": 33261,
      "new_path": "scripts/configure"
    },
    {
      "type": "modify",
      "old_id": "972bd37e7adda3de1f1f5bc5870134b596773491",
      "old_mode": 33261,
      "old_path": "scripts/configure.ac",
      "new_id": "5fdc3ef1b97082f1fad94a35add04abc5a022d34",
      "new_mode": 33261,
      "new_path": "scripts/configure.ac"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "f0f873d199d517607810720ecd1ddadc3bab916d",
      "new_mode": 33188,
      "new_path": "scripts/m4/ax_python_module.m4"
    },
    {
      "type": "modify",
      "old_id": "883b80e9371d67d6db9f217741fbbae27d2c9c99",
      "old_mode": 33188,
      "old_path": "sky130/Makefile.in",
      "new_id": "6576f3cff054c4fe165e73563c1231690d2df078",
      "new_mode": 33188,
      "new_path": "sky130/Makefile.in"
    }
  ]
}