)]}'
{
  "commit": "e81085944f1a039566f2972c863d189724988b46",
  "tree": "b56edc0b3da0259178dd90c03755f0869c94e31e",
  "parents": [
    "d128c3112d76960c63a5b4df54246671c6ea5a33"
  ],
  "author": {
    "name": "Andre Bossert",
    "email": "andre.bossert@siemens.com",
    "time": "Sun Jan 19 20:54:17 2020 +0100"
  },
  "committer": {
    "name": "Andrey Loskutov",
    "email": "loskutov@gmx.de",
    "time": "Mon May 30 13:28:32 2022 +0200"
  },
  "message": "Add filtering with help of DirCacheCheckout.getContent()\n\nsee: https://git-scm.com/docs/git-mergetool\n\n* refactoring of content (FileElement) handling\n* now the temporary files are already filled with filtered content in\nthe calling classes (PGM), that can be used with EGit content too\n\nTODO:\n * keep the temporaries when no change detected and the user answers no\nto the question if the merge was successful\n\nBug: 356832\nChange-Id: I86a0a052d059957d4d152c1bb94c262902c377d2\nSigned-off-by: Andre Bossert \u003candre.bossert@siemens.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "dc34c0d67bee9f75e78c0c31adbaef0ef771edc0",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java",
      "new_id": "8daaa6ad9ea283379e54e336ad6333c7a31796f7",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java"
    },
    {
      "type": "modify",
      "old_id": "d13eeb7e4d04bbb21b21e88594e64544f26aae7a",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ToolTestCase.java",
      "new_id": "933f19bcc44aed7ffdb613f3e0debebcaa96f1e6",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ToolTestCase.java"
    },
    {
      "type": "modify",
      "old_id": "ffba36fe20958f29b62bc3a4ba50264b00edcf6f",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java",
      "new_id": "74d91cd3d7bd57e1313cf5c6937eadb836184346",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java"
    },
    {
      "type": "modify",
      "old_id": "dce5a7996d73e2620361017002606b5b85063c8c",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeTool.java",
      "new_id": "9712770758856bd8a6dea81409762c57c787e7ca",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeTool.java"
    },
    {
      "type": "modify",
      "old_id": "ebc67c81cb52bf4da60ed6fb354568bc2a761156",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalDiffToolTest.java",
      "new_id": "4fd55c6cadf26f5ba295e132a2ce83c5eae38f73",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalDiffToolTest.java"
    },
    {
      "type": "modify",
      "old_id": "1dea44eaac3deabcb420b0fb10b2556a5552dcef",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalMergeToolTest.java",
      "new_id": "50576682eb19766d2a09a6082d9e1f0b872fdbb0",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalMergeToolTest.java"
    },
    {
      "type": "modify",
      "old_id": "6757eb4635dc1de2909db5c831a12c8a0425c6d9",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalToolTestCase.java",
      "new_id": "0fd85cb4568edbaf4caac068c0cecab8502b7099",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalToolTestCase.java"
    },
    {
      "type": "modify",
      "old_id": "2f2b9de8185ec46c13d1d38519c51a81d17be544",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffTools.java",
      "new_id": "1dcc523bf862e41252960930159081faf6c775e4",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffTools.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "3efb90c490dfc72485e87ce5eaa7280dd3c11ce9",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalToolUtils.java"
    },
    {
      "type": "modify",
      "old_id": "1ae87aaa6227fb98d9d398818c8419ed4c3f9fc6",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/FileElement.java",
      "new_id": "5902c1e1b8a30783215a03fcca02b2ec0dfd77e4",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/FileElement.java"
    },
    {
      "type": "modify",
      "old_id": "c4c2ceccff6bcbe6d331c41fc5b0a77407ed7e93",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java",
      "new_id": "9a2a8304ebe251de8563e239ec7e56106f524199",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java"
    },
    {
      "type": "modify",
      "old_id": "1ae0780ac89fc88c2d093a01535c091cdaefbd00",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ToolException.java",
      "new_id": "27f7d12e66bb4c74504e0fa52389759ba4fc9370",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ToolException.java"
    }
  ]
}
