)]}' { "commit": "806b0e6264bacbedda5bf15db061349d5bdff213", "tree": "3f091570f833344272505511fe750d6653546e20", "parents": [ "2199811a12a3cfbfed48634513caaa33c043762e" ], "author": { "name": "Axel Richard", "email": "axel.richard@obeo.fr", "time": "Wed Dec 03 10:24:55 2014 +0100" }, "committer": { "name": "Axel Richard", "email": "axel.richard@obeo.fr", "time": "Thu Dec 04 11:11:50 2014 +0100" }, "message": "Add Pull command, application, script \u0026 tests\n\nChange-Id: Ie79d31a3f90e6178042eba974cf22d67bcd3cfe9\nSigned-off-by: Axel Richard \u003caxel.richard@obeo.fr\u003e\n", "tree_diff": [ { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "0ac9deac4eb74e12314dcab7b91b19f7402add1a", "new_mode": 33188, "new_path": "packaging/org.eclipse.emf.compare.git.pgm.scripts/scripts/git-logicalpull" }, { "type": "modify", "old_id": "981cbbb80e575f5eec3c1478dd2c4666eeaca040", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/AbstractApplicationTest.java", "new_id": "ec6e7162d4cd1dd343b19b231c553c76a4c05e2a", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/AbstractApplicationTest.java" }, { "type": "modify", "old_id": "298afd3f43ff59c3e18c0a73dc2be99de1c2f7c0", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/LogicalAppTest.java", "new_id": "0017e6987593c9f859f3df6036c0c881cf22ab76", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/LogicalAppTest.java" }, { "type": "modify", "old_id": "451f6abf3302b77e944b54bb8d7b6f5fe2104474", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/CherryPickApplicationTest.java", "new_id": "5ddbba8ef4568a8c150dd75cedfb38ed31668245", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/CherryPickApplicationTest.java" }, { "type": "modify", "old_id": "81d9584ba9debc06d3459ab12ac64f70f222f494", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/MergeApplicationTest.java", "new_id": "10a1dac2cf17e11f94eca16c2c25b7acef375d84", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/MergeApplicationTest.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "b90202c8edd250675558cb8aca6f9ea22f8775f2", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/PullApplicationTest.java" }, { "type": "modify", "old_id": "83edd2ab7f91eaa37843a680ef256c9e22ee007f", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/RebaseApplicationTest.java", "new_id": "985d5b9e14380b538c72d067b6b4ed2d218a5d6e", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/RebaseApplicationTest.java" }, { "type": "modify", "old_id": "695dc2d122d4b78f4aa3bcfcbe6ba2ffbe33314a", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/ContextSetup.java", "new_id": "af5047aeda9cc779b4d0747eead229aaf0e6a800", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/ContextSetup.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL003/branch_a/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "27d51440d8f8b4e48912cd65f98d0b918ac72aab", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL003/branch_a/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "7e56504d1e42890381778796b9f1c90697c82028", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL003/branch_a/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL003/master_local/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "fe79745f3b1d309a7bcd2dabb4e94f65dc1f55e7", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL003/master_local/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "865a1bfff08a352704ee6f43063c501b800a0fcf", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL003/master_local/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL003/master_remote/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "fd855a82eaeaaa0b2598b558a34aa5efdd3f6d00", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL003/master_remote/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "277c3785d814f7149514deaa96ec01e4b1b6d3a0", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL003/master_remote/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/branch_a/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "6dce3f61b8e33aed7e15c89e26f1654d3868b76b", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/branch_a/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "b5c2b18c82994cac73764972c3ea522a7476d57a", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/branch_a/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/branch_a/model2.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "e024b69d83afbb08ce5b8b9fb9cbaa9a6bae97eb", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/branch_a/model2.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "5dd2c33f0c543cec215c42a0500df7a87b9b6d80", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/branch_a/model2.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/master_local/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "d93037f04c325f459a26cea52820ca70b239b7ca", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/master_local/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "56ec4894b1488239e2799f1ca22b473042b64f14", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/master_local/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/master_local/model2.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "481e9e473e6648a1f3b276d48d8ac9b24d4efc5e", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/master_local/model2.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "5d50dda93b2764ef6d13fb39f778f5eeb6af6b7a", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/master_local/model2.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/master_remote/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "d63cc631b00d7f8b5b93a7189d6eaf110a276b79", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/master_remote/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "8ca5aa7695cc42f8247958c658b6fd1cd0d937de", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/master_remote/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/master_remote/model2.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "4805ae0c1cbf8b2f0c19022826f3b3fa0da1350c", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/master_remote/model2.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "4aa0899f219ec4e67fe1526ec8f8d6119966b12f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL004/master_remote/model2.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "cac982021da028dd830b7189855acb02986d5d63", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/branch_a/Class1.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/branch_a/Class1.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "00bcd2cddb2aa49e1a974df0231e753c91a05ef8", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/branch_a/Class1.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/branch_a/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "db02c8fa2e60cbd5c007444b369e0b76b3d17567", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/branch_a/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "4ab0b2eb9c99876e30b588fa59aba3848637ff95", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/branch_a/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "cac982021da028dd830b7189855acb02986d5d63", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/master_local/Class1.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/master_local/Class1.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "676e6e6262a56dbf1d381f58edbef35265040967", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/master_local/Class1.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/master_local/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "9bb3438fcf40339f67d7c1fb1fa9ecbea482d1e3", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/master_local/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "4949a1a5b71432bce2c73ea619b4309979b5a1d7", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/master_local/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "cac982021da028dd830b7189855acb02986d5d63", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/master_remote/Class1.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/master_remote/Class1.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "42a98317e2fea951c6312ff02137ddfffaf996c7", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/master_remote/Class1.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/master_remote/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "cf77252d23df98af9086c3053b96fbdd3318d640", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/master_remote/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "c7233aeaf38055829191449a1601852eb7884a4d", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/automerging/PUL007/master_remote/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL001/branch_a/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "a7cc34e260cffad52ae5af510a53ba8991c923fb", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL001/branch_a/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "c9090f11abb58200e162365d2a28535f04fbd3be", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL001/branch_a/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL001/master_local/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "df6a90e09ab34ba6d60cc8f10330cdb6a4f01b03", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL001/master_local/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "5ca0d23587f3d58e8b148324a8ca3f206102a924", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL001/master_local/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL001/master_remote/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "2a99a4e0403419dafc242a0f6e37fc7d5e974e3d", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL001/master_remote/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "d306657dca887db3e05e8d669c7b926ea3c83dc1", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL001/master_remote/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL002/branch_a/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "0fe3149332685ad7b6f45f544ec1137e7864753e", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL002/branch_a/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "5e47b9a484e7483ad80bed8bc23770b76170aa7e", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL002/branch_a/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL002/branch_c/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "4b80e85bee24adb7200524df8cfb0270a89dd217", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL002/branch_c/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "369154fa81e18fa250a778aa6892c759f3e89966", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL002/branch_c/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL002/master_local/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "6e1c93c5add62f8702a22c4f172e035bbb594afc", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL002/master_local/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "21c1018a4c4fe9235731455ea93ec2781e419d33", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL002/master_local/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL002/master_remote/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "fc05f508c5f9fb83a7c70dda45ee0531b833fcee", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL002/master_remote/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "a024182d53e55beee0a125c1baa4c0cf5d3838b8", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL002/master_remote/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/branch_a/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "ac9d3ee9273fb3b3a511ad8879eee48ce6b3b224", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/branch_a/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "7b8aee8a19f5e8720bf70a2cd6aa08057b4034f1", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/branch_a/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/branch_a/model2.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "2d43e4759512c014d1ccd5cf01304442af5bbbd1", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/branch_a/model2.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "6cbeb9ce03ec83d2d6656c17a64f90db3dfd7e46", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/branch_a/model2.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/master_local/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "2e87e797f1d05332e7957957935523d144008fe1", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/master_local/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "fd1b1c96dc690868f38b55e922b624f591ba9211", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/master_local/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/master_local/model2.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "a17c58d03c6c1594385e45497a7ceaaea9cf5572", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/master_local/model2.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "63c0ecca45cef228e05a70f4ec4c31cc3192268a", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/master_local/model2.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/master_remote/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "227bb67e52dd9cbcabb66dcf531d08baaa89cc9e", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/master_remote/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "9554cf08349f33c5fbd2943972c7b7e03280354a", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/master_remote/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/master_remote/model2.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "afa1c99bc509c5dbf5f77702ccd9f7a3cf0017d5", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/master_remote/model2.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "54a5581d0b32de7a71a4aba046760136fbe38004", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL005/master_remote/model2.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/branch_a/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "ff9e08a62c41e5485ddb6dea2bbfa347d08118f6", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/branch_a/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "d43e7c3439e8b079bfa6d8f45bc2d41ac03d508c", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/branch_a/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/branch_a/model2.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "69bd08cfd1b64b320ada06066ec07f488f5c9991", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/branch_a/model2.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "decf638ff33e5e645f76ae18f49709df901d126f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/branch_a/model2.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/branch_c/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "a5d6c69189e7770d451c7f90e36bc6e074241e32", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/branch_c/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "e0a709bdc74106fe955f20d8c689900a5741812e", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/branch_c/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/branch_c/model2.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "69bd08cfd1b64b320ada06066ec07f488f5c9991", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/branch_c/model2.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "decf638ff33e5e645f76ae18f49709df901d126f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/branch_c/model2.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/master_local/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "1713e8c56aa272ef18c9ddd5c2708a505c6f268b", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/master_local/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "1bf536c8fa121d9193cf25e242f5dee321b29f1f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/master_local/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/master_local/model2.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "7fc47e4b47a6d6e33936724e1bc53c77094bdd1d", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/master_local/model2.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "040bc97870ae1f5aebb838714e05eb8cfea120a9", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/master_local/model2.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/master_remote/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "a5d6c69189e7770d451c7f90e36bc6e074241e32", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/master_remote/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "e0a709bdc74106fe955f20d8c689900a5741812e", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/master_remote/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/master_remote/model2.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "486777b17bc2e35fb7f3764107732de0521b2cb9", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/master_remote/model2.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "058876c23a0923b2a3765409998ab0cadacf51ab", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL006/master_remote/model2.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "cac982021da028dd830b7189855acb02986d5d63", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/branch_a/Class1.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/branch_a/Class1.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "f599dddf312c7b076a1451ecaa9b22464186e1b6", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/branch_a/Class1.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/branch_a/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "afb41671d6183382c19f9add049723cd7dd53087", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/branch_a/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "e9fc3361a8c4ae99a2730b2914d49c6d9782fd17", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/branch_a/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "cac982021da028dd830b7189855acb02986d5d63", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/master_local/Class1.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/master_local/Class1.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "530ba0240cf6a2d76e92349d38be1c0489e68e5a", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/master_local/Class1.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/master_local/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "3c74852b1ecd4cfa4edc71845dbb00928806ad0e", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/master_local/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "7f25fe2a59d863caf2728b8492f78d64ab266227", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/master_local/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/master_remote/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "579f6e1ce2a0c856d5fd9efa7737952f994e75a0", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/master_remote/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "194786700f1887333dc8a69cf7932b7ab44f0562", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL008/master_remote/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL011/branch_a/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "9126388df2579b8901c2b2f67ac79dc1f8126cd5", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL011/branch_a/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "b6520176872d5f91c36d3853c9a61a33a75ff221", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL011/branch_a/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL011/master_local/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "2943cc179094dcdbb7e3d3570c3c5bdad3073059", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL011/master_local/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "c431056434037b4e4d7128f8ad96952f1dc3a5ef", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL011/master_local/model.uml" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "bf9abab340f5ecdf972f830c46f57d08d822d01f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL011/master_remote/model.di" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "49016602d8c5ff41ea2b6b01a18da30d8506177f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL011/master_remote/model.notation" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "cbd000827b359ca52bb90ae031baa0a6d38755f3", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/app/data/conflicts/PUL011/master_remote/model.uml" }, { "type": "modify", "old_id": "973fb66d5b11c7711e879405c3c2c1f03b076b51", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CherryPickArgumentsTest.java", "new_id": "42f56faef8b6a294195a7387449889485c7908f0", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CherryPickArgumentsTest.java" }, { "type": "modify", "old_id": "771e26a24a0c4c8562e2f7d2b21e0770b933fca2", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeArgumentsTest.java", "new_id": "96608244c2d1834042997839adb2b958fd754e3c", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeArgumentsTest.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "e467e8350117160bb0d6d50716e56c65fccf3581", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/internal/cmd/PullArgumentsTest.java" }, { "type": "modify", "old_id": "bae47beae9ec209b02652f65b1f1a787e7b0a77d", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/suite/AllCommandLineArgumentTests.java", "new_id": "a5c7bb9c77a154071caea077fb266209ae24060f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/suite/AllCommandLineArgumentTests.java" }, { "type": "modify", "old_id": "addd2ac1a8a955341ff9455913285ed5fbc83e73", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/suite/AllLogicalApplicationTests.java", "new_id": "b0360e1fe40d72813468d7582e2dda689865011c", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/suite/AllLogicalApplicationTests.java" }, { "type": "modify", "old_id": "ff2569ca9651167af4f8c6ae9740538522eeb80c", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/util/ProjectBuilder.java", "new_id": "5ee4ee91444f14d50f4c670a6ca7487d42a7508d", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm.tests/src/org/eclipse/emf/compare/git/pgm/util/ProjectBuilder.java" }, { "type": "modify", "old_id": "8de184f94172ebb69cbd45672a476e5b5eb59daa", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm/plugin.xml", "new_id": "ba94821f781ea0eabf1de3d582a0784272013738", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm/plugin.xml" }, { "type": "modify", "old_id": "73ca53200d003134648657382179fb7928904885", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/MergeApplication.java", "new_id": "75e28444b538808a75c127b47c2c0226ac6a429d", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/MergeApplication.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "c412797b12342c0fcf7ccbe38ea87efcd82ea0b7", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/app/PullApplication.java" }, { "type": "modify", "old_id": "d7fb23757b487e0cc28f595b765b00ad831e075b", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CherryPickCommand.java", "new_id": "d4b88817dddf03f5641fffe602a386185ae33417", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CherryPickCommand.java" }, { "type": "modify", "old_id": "bdc5749abf9904ee810cf4cdad7688ab7ca89934", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CommandFactory.java", "new_id": "57873310f8b1b2d7d002293c4f9dbcd6309278da", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/CommandFactory.java" }, { "type": "modify", "old_id": "d41e28b4a9dce832c6475e8742994412e38969b6", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeCommand.java", "new_id": "52fa03d094ee2fc2194509689909b36b9cfe2fb0", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/MergeCommand.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "395d91bd3c1b002256d08a1369a0f403c2b75fe6", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.git.pgm/src/org/eclipse/emf/compare/git/pgm/internal/cmd/PullCommand.java" } ] }