)]}'
{
  "commit": "a8e683fef6acf3e9f00ac2648fff60b13a28fb13",
  "tree": "a83746d664b648d784aa441e18b28a33f2a1879d",
  "parents": [
    "583bf00233d2c3f0fc6b1e90f940d31e2dec5ad0"
  ],
  "author": {
    "name": "Thomas Wolf",
    "email": "twolf@apache.org",
    "time": "Tue Aug 16 01:02:21 2022 +0200"
  },
  "committer": {
    "name": "Matthias Sohn",
    "email": "matthias.sohn@sap.com",
    "time": "Wed Sep 07 15:02:02 2022 +0200"
  },
  "message": "[merge] Fix merge conflicts with symlinks\n\nPrevious code would do a content merge on symlinks, and write the merge\nresult to the working tree as a file. C git doesn\u0027t do this; it leaves\na symlink in the working tree unchanged, or in a delete-modify conflict\nit would check out \"theirs\".\n\nMoreover, previous code would write the merge result to the link target,\nnot to the link. This would overwrite an existing link target, or fail\nif the link pointed to a directory.\n\nIn link/file conflicts or file/link conflicts, C git always puts the\nfile into the working tree.\n\nChange conflict handling accordingly. Add tests for all the conflict\ncases.\n\nBug: 580347\nChange-Id: I3cffcb4bcf8e336a85186031fff23f0c4b6ee19d\nSigned-off-by: Thomas Wolf \u003ctwolf@apache.org\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "54e4a09ee52d28c81647a55e180ee2103594a957",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java",
      "new_id": "483b9a7c8173ec9ed4f1ac17bd0a5dcb84e6f66c",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "3cdc8da34ef125ebbe145461e80f040d03876f1d",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SymlinkMergeTest.java"
    },
    {
      "type": "modify",
      "old_id": "23f8e4a5d57c1ce0b2995f9966f7a07d67a5f1ab",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java",
      "new_id": "8b9b569c389ed668d3b327edc0ad18110386c1bd",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java"
    }
  ]
}