Fwd: svn commit: r996383 - in /subversion/trunk/subversion: svn/conflict-callbacks.c tests/cmdline/resolve_tests.py

[Daniel Shahaf]

New feature.  Currently undocumented.  Perhaps it should be documented
in the the book (wherever it currently documents the --accept option)?

New in 1.7.0 and nominated for 1.6.14.

Daniel


----- Forwarded message from danielsh at apache.org -----

> URL: http://svn.apache.org/viewvc?rev=996383&view=rev
> Log:
> 'svn --accept': add shorthands.

>    svntest.actions.run_and_verify_resolve([psi_COPY_path],
> -                                         '-R', '--accept', 'theirs-full',
> +                                         '-R', '--accept', 'tf',
>                                           A_COPY_path)

----- End forwarded message -----