Differences between version 3 and revision by previous author of CVSHowto.
Other diffs: Previous Major Revision, Previous Revision, or view the Annotated Edit History
| Newer page: | version 3 | Last edited on Thursday, March 17, 2005 10:11:51 am | by JohnMcPherson | Revert |
| Older page: | version 2 | Last edited on Thursday, March 3, 2005 3:20:21 pm | by AlastairPorter | Revert |
@@ -91,13 +91,13 @@
conflict between your local changes and someone else's committed changes
__M__:
modified on your end but not yet committed
__P__:
- modified on both ends, changes merged successfully into
your copy
+ patched to bring
your (unmodified) version up-to-date with the last change.
__R__:
removed from the main repository
__U__:
- updated with other people's changes
+ updated your (unmodified) version
with other people's (multiple?)
changes
----
!! An examples using the GreenStone SourceCode
