Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core/html/00022.html')
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00022.html29
1 files changed, 0 insertions, 29 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00022.html b/tests/org.eclipse.team.tests.cvs.core/html/00022.html
deleted file mode 100644
index c60fcf158..000000000
--- a/tests/org.eclipse.team.tests.cvs.core/html/00022.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html><head><title>Performing a Merge</title>
-<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css>
-<meta NAME="keywords" content="">
-<meta NAME="since" content="">
-</head><body><h2>Performing a Merge</h2>
-<p>Since: M8<br>
-Last Modified: $Date: 2004/06/01 15:23:56 $</p>
-
-
-<h3>Scenario 1: One Time Merge</h3>
-
-<p>
-Using Team>Merge, merge the changes from a branch into HEAD. Once completed, in the synchronize view,
-update the incoming changes, resolve any conflicts and ensure they worked, After updating,
-redo the same merge. A no-changes dialog should be
-presented since the local contents match the end-point.
-
-<h3>Scenario 2: Ongoing Merge</h3>
-
-After performing a one-time merge, pin the entry in the synchronize view.
-Release changes to the end point (branch) and synchronize the merge.
-The new changes should appear in the synchronize view. Update to these
-changes as appropriate.
-
-<h3>Removing a Merge</h3>
-
-<p>Delete the merge from the synchronize view using the remove toolbar button. The merge subscriber should be removed from the view.
-
-</body></html> \ No newline at end of file

Back to the top