diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitLogicalMergeTest.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitLogicalMergeTest.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitLogicalMergeTest.java b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitLogicalMergeTest.java index 8c2da6590..c7fff5d57 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitLogicalMergeTest.java +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitLogicalMergeTest.java @@ -37,7 +37,8 @@ public class GitLogicalMergeTest extends AbstractGitLogicalModelTest { /** * Sets up the repository so that there are three commits affecting a single file. * <ul> - * <li>initial commit : A single file "file1" contains a package P1 which contains the classes C1 and C2.</li> + * <li>initial commit : A single file "file1" contains a package P1 which contains the classes C1 and C2. + * </li> * <li>master commit : delete C2</li> * <li>branch commit : make C2 a super-class of C1</li> * </ul> @@ -89,7 +90,8 @@ public class GitLogicalMergeTest extends AbstractGitLogicalModelTest { /** * Sets up the repository so that there are three commits affecting a single file. * <ul> - * <li>initial commit : A single file "file1" contains a package P1 which contains the classes C1 and C2.</li> + * <li>initial commit : A single file "file1" contains a package P1 which contains the classes C1 and C2. + * </li> * <li>master commit : rename C1 into C10</li> * <li>branch commit : make C2 a super-class of C1</li> * </ul> @@ -143,7 +145,8 @@ public class GitLogicalMergeTest extends AbstractGitLogicalModelTest { /** * Sets up the repository so that there are three commits affecting a single file. * <ul> - * <li>initial commit : A single file "file1" contains a package P1 which contains the classes C1 and C2.</li> + * <li>initial commit : A single file "file1" contains a package P1 which contains the classes C1 and C2. + * </li> * <li>master commit : delete C2</li> * <li>branch commit : delete C2</li> * </ul> |