)]}'
{
  "commit": "7ceb61494bba8e3de16c26d1b3c36d4d74fb4975",
  "tree": "c26ece5887f4f175938fa18e0f4c0617e97abf15",
  "parents": [
    "2345cc88d0ed7b6d639ba7a1874f2200f3b21df1"
  ],
  "author": {
    "name": "Marija Savtchouk",
    "email": "mariasavtchouk@google.com",
    "time": "Thu Apr 01 15:52:26 2021 +0100"
  },
  "committer": {
    "name": "Marija Savtchouk",
    "email": "mariasavtchouk@google.com",
    "time": "Tue Apr 06 09:33:04 2021 +0100"
  },
  "message": "Allow file mode conflicts in virtual base commit on recursive merge.\n\nSimilar to https://git.eclipse.org/r/c/jgit/jgit/+/175166, ignore\npath that have conflicts on attributes, so that the virtual base could\nbe used by RecursiveMerger.\n\nChange-Id: I99c95445a305558d55bbb9c9e97446caaf61c154\nSigned-off-by: Marija Savtchouk \u003cmariasavtchouk@google.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "eecf25be905d295147972021154977d13b4aac38",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java",
      "new_id": "6cbb4a89b218e609bae3c13c0686bb32f091c0fc",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java"
    },
    {
      "type": "modify",
      "old_id": "4bfb38d286947235a0f55cbcd5a8ca94006f6300",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java",
      "new_id": "b01125898145287033b5525ac63d4c850838daa3",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java"
    }
  ]
}