svn commit: r1207539 - /subversion/site/publish/docs/svn-merge.txt

[da...@apache.org]

Author: danielsh
Date: Mon Nov 28 19:42:41 2011
New Revision: 1207539

URL: http://svn.apache.org/viewvc?rev=1207539&view=rev
Log:
* docs/svn-merge.txt:
    Note that this informatino also exists in the book. 
    Set and use svn:keywords.

(Note: this file is linked from <http://s.apache.org/svnmerge>)

Modified:
    subversion/site/publish/docs/svn-merge.txt   (contents, props changed)

Modified: subversion/site/publish/docs/svn-merge.txt
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/svn-merge.txt?rev=1207539&r1=1207538&r2=1207539&view=diff
==============================================================================
--- subversion/site/publish/docs/svn-merge.txt (original)
+++ subversion/site/publish/docs/svn-merge.txt Mon Nov 28 19:42:41 2011
@@ -1,3 +1,11 @@
+
+$LastChangedDate$
+
+The following is the help text of 'svn merge' in 1.7.x.  This information is
+also available in the Subversion Book:
+    http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.merge.html
+
+
 merge: Apply the differences between two sources to a working copy path.
 usage: 1. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]
        2. merge --reintegrate SOURCE[@REV] [TARGET_WCPATH]

Propchange: subversion/site/publish/docs/svn-merge.txt
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision