You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2015/04/21 11:53:53 UTC

svn commit: r1675077 - /subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

Author: julianfoad
Date: Tue Apr 21 09:53:53 2015
New Revision: 1675077

URL: http://svn.apache.org/r1675077
Log:
On the 'move-tracking-2' branch: Clarify the help for 'svnmover merge'.

Suggested by: danielsh

* subversion/svnmover/svnmover.c
  (action_defn): Tweak help text.

Modified:
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1675077&r1=1675076&r2=1675077&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Tue Apr 21 09:53:53 2015
@@ -264,7 +264,7 @@ static const action_defn_t action_defn[]
   {ACTION_DIFF_E,           "diff-e", 2, "LEFT RIGHT",
     "diff LEFT to RIGHT (element-focused output)"},
   {ACTION_MERGE,            "merge", 3, "FROM TO YCA@REV",
-    "merge changes YCA->FROM and YCA->TO into TO"},
+    "3-way merge YCA->FROM into TO"},
   {ACTION_CP,               "cp", 2, "REV SRC DST",
     "copy SRC@REV to DST"},
   {ACTION_MV,               "mv", 2, "SRC DST",