>> 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.
[...]
>> - "('base', 'working', 'mine-conflict',\n"
> ^^^^^^^
>> + "('working', 'base', 'working', 'mine-conflict',\n"
> ^^^^^^^ ^^^^^^^
Bert wrote:
> I see litterally ‘working, base, working’ in this patch??
>
> How was it missing? (Is it somehow filtered?)
Stefan wrote:
> I don't understand this change. 'working' was already mentioned.
>
> Was this a mistake?
Huh. Yes, I must have been too tired. (What happened was I was initially
expecting the value to be named 'merged', and that was missing so I started to
add it, and then I realized the correct name is 'working'... and didn't look or
think any further.)
Reverted in r1456930. Thanks both of you for catching it.
- Julian
