Differences between version 2 and previous revision of rcsmerge(1).
Other diffs: Previous Major Revision, Previous Author, or view the Annotated Edit History
| Newer page: | version 2 | Last edited on Tuesday, June 4, 2002 12:22:49 am | by perry | Revert |
| Older page: | version 1 | Last edited on Tuesday, June 4, 2002 12:22:49 am | by perry | Revert |
@@ -50,9 +50,9 @@
__-A__
Output conflicts using the __-A__ style of
-__
diff3__
(1), if supported by __diff3__. This merges
+diff3(1), if supported by __diff3__. This merges
all changes leading from ''file2'' to ''file3'' into
''file1'', and generates the most verbose
output.
@@ -60,9 +60,9 @@
__-E__, __-e__
These options specify conflict styles that generate less
-information than __-A__. See __
diff3__
(1) for details.
+information than __-A__. See diff3(1) for details.
The default is __-E__. With __-e__, __rcsmerge__
does not warn about conflicts.
