)]}'
{
  "commit": "4f48a5b1e3842aeeae6b8f0f5d517819373221a4",
  "tree": "d913080723219af0ec023689234759414951928c",
  "parents": [
    "eeccc5a92e78d6bef5908a61481e159e6c38288a"
  ],
  "author": {
    "name": "Nasser Grainawi",
    "email": "quic_nasserg@quicinc.com",
    "time": "Mon Oct 21 20:26:35 2024 -0600"
  },
  "committer": {
    "name": "Nasser Grainawi",
    "email": "quic_nasserg@quicinc.com",
    "time": "Mon Nov 04 15:34:46 2024 -0700"
  },
  "message": "Add Union merge strategy support\n\nAllow users to specify the `union` strategy in their .gitattributes file\nin order to keep lines from both versions of a conflict [1].\n\n[1] https://git-scm.com/docs/gitattributes.html#Documentation/gitattributes.txt-union\n\nChange-Id: I74cecceb2db819a8551b95fb10dfe7c2b160b709\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "009ca8a15203b44ae54d995c0e5c6c5acadb200e",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java",
      "new_id": "ac30c6c5261d56b534663f47a1a568e95d7ab64b",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "3a8af7a00e9e6f5960dcb386f31a572460857f31",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmUnionTest.java"
    },
    {
      "type": "modify",
      "old_id": "50a04d20f014c6702716c1c522038d73e4628410",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/.settings/.api_filters",
      "new_id": "28b20ab01f5051a51c4db9c94c9c1e979c9513c1",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/.settings/.api_filters"
    },
    {
      "type": "modify",
      "old_id": "60a23dde057052b4388ec56b03ed667ebfb9c370",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java",
      "new_id": "1a97d111e34e14a8b285932a89b7b61a7c0b65c3",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java"
    },
    {
      "type": "modify",
      "old_id": "6d568643d5a46c7ef3bf1c2198034b235640607d",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/ContentMergeStrategy.java",
      "new_id": "a835a1dfc527a2e30d7afcbffa34648f4612f287",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/ContentMergeStrategy.java"
    },
    {
      "type": "modify",
      "old_id": "5734a25276bc6d19318852fc737ce2ad38638de8",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java",
      "new_id": "d0d4d367b91ee6a19a5cd8d01ea6a5745aa9e26a",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java"
    },
    {
      "type": "modify",
      "old_id": "1ad41be42361a4db91adb283be6fc0782fe941fc",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java",
      "new_id": "85b85cf855cbaebed1cb08bc123e712447978cb9",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java"
    }
  ]
}