svn commit: r1089387 - /subversion/trunk/subversion/svn/main.c

[st...@apache.org]

Author: stylesen
Date: Wed Apr  6 10:31:03 2011
New Revision: 1089387

URL: http://svn.apache.org/viewvc?rev=1089387&view=rev
Log:
Fix a typo in help message.

* subversion/svn/main.c
  (svn_cl__merge): s/2-UL/2-URL/

Modified:
    subversion/trunk/subversion/svn/main.c

Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1089387&r1=1089386&r2=1089387&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Apr  6 10:31:03 2011
@@ -886,7 +886,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "       \n"
      "         svn merge ^/trunk@500 ^/feature\n"
      "\n"
-     "     Before performing a 2-UL merge, it is a good idea to preview the\n"
+     "     Before performing a 2-URL merge, it is a good idea to preview the\n"
      "     changes which will be merged, because there is no guarantee that\n"
      "     the merge will be free of conflicts. The preview can be done with\n"
      "     the svn diff command:\n"