)]}'
{
  "commit": "d4ceb3f8daf02a39d109921d08f79bf98774e925",
  "tree": "3f0d2bb807b23a367d3e19f9b5c6ef7aba329bfb",
  "parents": [
    "490ed19fc73522265027ea377ff745289160d21f"
  ],
  "author": {
    "name": "Jason Krause",
    "email": "weltraumheld@gmail.com",
    "time": "Tue Feb 03 08:12:52 2026 +0100"
  },
  "committer": {
    "name": "Matthias Sohn",
    "email": "matthias.sohn@sap.com",
    "time": "Tue Feb 24 22:45:00 2026 +0000"
  },
  "message": "Support diff3 conflict style in merges\n\nAdd conflict style setters to commands that can produce\nmerge conflicts and default to merge.conflictStyle from\nthe Git config. Propagate the setting into the merger\nand select the appropriate formatter in ResolveMerger.\n\nActivate existing diff3 support and add tests for the new behavior.\n\nBug: https://bugs.eclipse.org/bugs/show_bug.cgi?id\u003d442284\nChange-Id: Ic201492b2f086712d61fa61dc2c53fcbe5de46b3\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "3f5c5da55a1a3ddd6113b027ca3187d3621e8ecf",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java",
      "new_id": "cb91b121c64ab1d66ebd3ce0f4ca81f9e33dbbf1",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java"
    },
    {
      "type": "modify",
      "old_id": "1ec506798c437215e6111d713053e4053d3ecbeb",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java",
      "new_id": "086e2613867c844d71611ad7506213a1ace277e2",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java"
    },
    {
      "type": "modify",
      "old_id": "695681de8dcef4dd973a50ee961490d468d4e93e",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java",
      "new_id": "5c33f038cf12009f7ae0751f980933409e66db27",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java"
    },
    {
      "type": "modify",
      "old_id": "4c8cf06a673fa6a691357ab386a7bcf292b11dcf",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java",
      "new_id": "d99c28564553d336e0a66e692a1eea1429bdb5d2",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java"
    },
    {
      "type": "modify",
      "old_id": "89fdb3222045d9a7b9ac3eef1e670ca8bfcc2feb",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java",
      "new_id": "a7a1dff8d1b0cd51cd313f9418c1eb7da12f92ad",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java"
    },
    {
      "type": "modify",
      "old_id": "49b31b1c4c7597f2dd251e6ed5fdb1a7b6108570",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java",
      "new_id": "b169fac9483653fd2d9aab956aacfe5d7e56d4a4",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java"
    },
    {
      "type": "modify",
      "old_id": "c6a6321cf80773c4d0a1261b8a7f64032ae544e2",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java",
      "new_id": "b5e4b2122bb0f754e0d0d339506e38e6acb69642",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java"
    },
    {
      "type": "modify",
      "old_id": "a353d1a1358a5ac8455d9d5864da8b801a4f5807",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java",
      "new_id": "6761f1eee56dfee35edd2b355bb5dba3bc4fd17c",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java"
    },
    {
      "type": "modify",
      "old_id": "7064f5a57a92e262e928f8f3a5dd1a5b870af5a0",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java",
      "new_id": "a79fbf734973f6e50f2f1578efb24b91fcef63e1",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java"
    },
    {
      "type": "modify",
      "old_id": "4b2cee45c26e276340cd9ca8ebb573e91fc6eb6c",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java",
      "new_id": "ff5dbffea2222ddc0cb469330d86b81e4a15c083",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java"
    },
    {
      "type": "modify",
      "old_id": "ae0389cc3d3d63fece4eaf2278ac33b12c7498fd",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java",
      "new_id": "ba8461d759fb9ad7fcc19706427d06b87117fcde",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java"
    },
    {
      "type": "modify",
      "old_id": "6643c83662757176f129cfa2fe51e9683202cd0b",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java",
      "new_id": "5a107d57ad00611c89e9024480aa78ca66db223b",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java"
    },
    {
      "type": "modify",
      "old_id": "b0b715e06b4bc0cece092c7b590fa74cbaa6e97f",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java",
      "new_id": "aa733b53a672b929025f0ac5ca1c5e3f9dfe6507",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java"
    },
    {
      "type": "modify",
      "old_id": "54b7aa4346bdfe43659873afa2c7294e9fc9d07d",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java",
      "new_id": "680e3e4b81613d364209c6e77e7fd753e3a17852",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java"
    },
    {
      "type": "modify",
      "old_id": "dc96f65b87835a3d0e9f0b65fe6cc620bbc32d14",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java",
      "new_id": "cb8257719285b4929696b822cdf4031f71f847a8",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java"
    }
  ]
}