On Thu, Mar 14, 2013 at 08:09:45PM -0000, julianf...@apache.org wrote: > Author: julianfoad > Date: Thu Mar 14 20:09:44 2013 > New Revision: 1456636 > > URL: http://svn.apache.org/r1456636 > Log: > * subversion/svn/svn.c > (svn_cl__cmd_table): In the help for 'svn resolve', add the missing value > 'working' for the '--accept' option. > > Modified: > subversion/trunk/subversion/svn/svn.c > > Modified: subversion/trunk/subversion/svn/svn.c > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1456636&r1=1456635&r2=1456636&view=diff > ============================================================================== > --- subversion/trunk/subversion/svn/svn.c (original) > +++ subversion/trunk/subversion/svn/svn.c Thu Mar 14 20:09:44 2013 > @@ -1343,7 +1343,7 @@ const svn_opt_subcommand_desc2_t svn_cl_ > {opt_targets, 'R', opt_depth, 'q', opt_accept}, > {{opt_accept, N_("specify automatic conflict resolution source\n" > " " > - "('base', 'working', 'mine-conflict',\n" ^^^^^^^ > + "('working', 'base', 'working', 'mine-conflict',\n" ^^^^^^^ ^^^^^^^
I don't understand this change. 'working' was already mentioned. Was this a mistake? > " " > "'theirs-conflict', 'mine-full', 'theirs-full')")}} }, > >
