Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core/html/00041.html')
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00041.html7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00041.html b/tests/org.eclipse.team.tests.cvs.core/html/00041.html
index 1b01a511a..f04a15bfc 100644
--- a/tests/org.eclipse.team.tests.cvs.core/html/00041.html
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00041.html
@@ -4,13 +4,14 @@
<meta NAME="since" content="">
</head><h2>File Revisions</h2>
<p>Since: M8<br>
-Last Modified: $Date: 2004/03/05 17:12:22 $</p><body>
+Last Modified: $Date: 2004/03/09 20:51:17 $</p><body>
<h3>Compare the local resource with other revisions</h3>
<ul>
<li>If the file isn't managed the action should no appear.
<li>If the file doesn't have any revisions you should be prompted
<li>If the file has revisions you should be prompted with the list of revisions in a compare dialog
-<li>In the compare dialog you can select any revision and mreges changes into the local copy
+<li>In the compare dialog you can select any revision and merge changes into the local copy
<li>If you edit the local resource then chose OK, you will be prompted to save changes. Ensure that the changes are saved correctly to the underlying resource.
-<li>Ensure that the titles are ok (e.g. dialog title, structure pane title...) \ No newline at end of file
+<li>Ensure that the titles are ok (e.g. dialog title, structure pane title...)
+</ul> \ No newline at end of file

Back to the top