diff options
| author | Michael Valenta | 2006-02-06 23:47:31 +0000 |
|---|---|---|
| committer | Michael Valenta | 2006-02-06 23:47:31 +0000 |
| commit | 054177df9af21e3b871a19cf7d5a6507bdcaf3ff (patch) | |
| tree | 3e8de1477e3b7486d30044dafc219baae1ab3f0b /tests/org.eclipse.team.tests.cvs.core | |
| parent | 5788a79bc99b09d12883199aebb5cf3cdefe1868 (diff) | |
| download | eclipse.platform.team-054177df9af21e3b871a19cf7d5a6507bdcaf3ff.tar.gz eclipse.platform.team-054177df9af21e3b871a19cf7d5a6507bdcaf3ff.tar.xz eclipse.platform.team-054177df9af21e3b871a19cf7d5a6507bdcaf3ff.zip | |
Bug 126616I StorageMerger is not called in three-way merge with no common ancestor
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core')
| -rw-r--r-- | tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java index 0a9095ad4..1f0f43325 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java @@ -260,6 +260,9 @@ public class EclipseTest extends ResourceTest { protected void handleValidationFailure(IStatus status) { // Do nothing } + protected void handleMergeFailure(IStatus status) { + // Do nothing + } }); } else { executeHeadless(new UpdateOperation(null, mappings, options, null)); |