| commit | 706f1b39bb9b46756661c5f6f1feedf375b0e79a | |
| author | Philip Langer <planger@eclipsesource.com> | |
| Sat, 10 Jan 2015 11:20:16 +0000 (10 12:20 +0100) | ||
| committer | Axel RICHARD <axel.richard@obeo.fr> | |
| Wed, 21 Jan 2015 12:00:27 +0000 (21 07:00 -0500) | ||
| tree | 1e16f8ca18502986ffb92f1bfe383ac76407cb50 | treesnapshot (tar.gz zip) |
| parent | b845f84cbf9c4259c822435c2f7b240174e625d9 | commitdiff |
[456535] Adds UI test for model-based merge from EGit history
This test validates whether the model-based merge of branch1 into
branch master works when invoked from EGit.
Bug: 456535
Change-Id: I83e4ec6b83b151c1c4bf13a6c9f322ec1ba36003
Signed-off-by: Philip Langer <planger@eclipsesource.com>
This test validates whether the model-based merge of branch1 into
branch master works when invoked from EGit.
Bug: 456535
Change-Id: I83e4ec6b83b151c1c4bf13a6c9f322ec1ba36003
Signed-off-by: Philip Langer <planger@eclipsesource.com>
| plugins/org.eclipse.emf.compare.q7.tests/contexts/EGitMultipleBranchWorkspaceContext.ctx | [new file with mode: 0644] | blob |
| plugins/org.eclipse.emf.compare.q7.tests/contexts/Library-EGit-Multiple-Branch-Init.ctx | [new file with mode: 0644] | blob |
| plugins/org.eclipse.emf.compare.q7.tests/resources/Library-EGit-Multiple-Branches.zip | [new file with mode: 0644] | blob |
| plugins/org.eclipse.emf.compare.q7.tests/tests/egit/ts005_tc020_merge_branch1_into_master.test | [new file with mode: 0644] | blob |
| plugins/org.eclipse.emf.compare.q7.tests/tests/ts005-egit.suite | diffblobblamehistory |