)]}'
{
  "commit": "85734356351ec2df4067b2472a37f6d9bcbb7350",
  "tree": "0596c7e5a59bfdbe37f1fb5456c755ec9a823580",
  "parents": [
    "24171b05f0db8487d0a1dc40072cc313bb6e2087"
  ],
  "author": {
    "name": "Andre Bossert",
    "email": "andre.bossert@siemens.com",
    "time": "Sun Jan 19 20:52:56 2020 +0100"
  },
  "committer": {
    "name": "Andrey Loskutov",
    "email": "loskutov@gmx.de",
    "time": "Wed May 25 13:52:04 2022 +0200"
  },
  "message": "Add command line support for \"git mergetool\"\n\nsee: https://git-scm.com/docs/git-mergetool\nsee: https://git-scm.com/docs/git-config\n\n* add command line support for \"git mergetool\"\n  * add option handling for \"--tool-help\", \"--tool\u003d\u003cmytool\u003e\",\n\"--[no-]prompt\",  \"--[no-]gui\"\n  * handle prompt\n  * add MergeTools\n  * add pre-defined mergetools\n  * print merge actions --\u003e no execute, will be done later\n\nBug: 356832\nChange-Id: I6e505ffc3d03f75ecf4bba452a25d25dfcf5793f\nSigned-off-by: Andre Bossert \u003candre.bossert@siemens.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "e2ff1892764e50542b9fb5e51edd49609ac305a8",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java",
      "new_id": "017a5d994f42de9d9df0b38cb293e6163d29a7ed",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "e10b13efb149a956b25852027f03489635ed84b8",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ExternalToolTestCase.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "32cd60415e9f4414a664cc1d6688a413a99cb433",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java"
    },
    {
      "type": "modify",
      "old_id": "8c44764c6360a0e60ce6e5d1d4562f8b6872442e",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin",
      "new_id": "ea1d1e3faaee4b551d36224678e68e6b4dcbbf2b",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin"
    },
    {
      "type": "modify",
      "old_id": "3653b9d8fc18467c347465a55ba83d372a891119",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties",
      "new_id": "8e2eef7eb2e36862beec10c818204bdc068dbd62",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties"
    },
    {
      "type": "modify",
      "old_id": "2f7417745281b822ee2dd54a670dff38c8a28e5f",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java",
      "new_id": "2e90d52cba3d6b5a702ed9a1e51be11a2e9b99ce",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "37afa54c783ff555f1b42ad0e719274a0679650f",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeTool.java"
    },
    {
      "type": "modify",
      "old_id": "96fd1026c7b61270c43952bf9704ee972eca5d8a",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalMergeToolTest.java",
      "new_id": "1dea44eaac3deabcb420b0fb10b2556a5552dcef",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalMergeToolTest.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "3a22124328180ff614dfc2ed706e542087e9cccb",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineMergeTool.java"
    },
    {
      "type": "modify",
      "old_id": "b15cbdc34a5e902f44379f4aa5e09cec6789a82f",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffTools.java",
      "new_id": "2f2b9de8185ec46c13d1d38519c51a81d17be544",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffTools.java"
    },
    {
      "type": "modify",
      "old_id": "bcc749adadefbdaee7dc1fc55942aa83af89c86f",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalMergeTool.java",
      "new_id": "0c3ddf9afefb4eca37175827e46473aa4f6625c4",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalMergeTool.java"
    },
    {
      "type": "modify",
      "old_id": "e912822613e87d64c4baf25a0160d1c60d9626cf",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeToolConfig.java",
      "new_id": "9be20b75ad6825251b884f354b0f4f0286cec580",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeToolConfig.java"
    },
    {
      "type": "modify",
      "old_id": "bb5d73eeb21476fce2ec1e4c1e9ce89d37642c39",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java",
      "new_id": "cefefb8e75614114f9a6367a21755bd84683d433",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/MergeTools.java"
    },
    {
      "type": "add",
      "old_id": "0000000000000000000000000000000000000000",
      "old_mode": 0,
      "old_path": "/dev/null",
      "new_id": "2c64c16667e1867ff954da46e10c0e96614f18dc",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/PreDefinedMergeTool.java"
    },
    {
      "type": "modify",
      "old_id": "df4d8cb8c6018f30d19695a4f797a3aaa4d0a0e6",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/UserDefinedMergeTool.java",
      "new_id": "1dd2f0d7938d81f9494d2654a5a52ccf56334940",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/UserDefinedMergeTool.java"
    },
    {
      "type": "modify",
      "old_id": "e982a33b2995abc23c26f92d4a50a691f65bf3b0",
      "old_mode": 33188,
      "old_path": "org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java",
      "new_id": "29c66f5165825c18d141a2722e8432616b9d9b93",
      "new_mode": 33188,
      "new_path": "org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java"
    }
  ]
}
