Author: stsp Revision: 1027970 Modified property: svn:log Modified: svn:log at Wed Oct 27 14:27:47 2010 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Wed Oct 27 14:27:47 2010 @@ -25,7 +25,7 @@ See for related discussion: http://svn.haxx.se/dev/archive-2010-10/0000.shtml * subversion/svn/merge-cmd.c - (svn_cl__merge): Reject --allow-mixed-revisions in combintation with + (svn_cl__merge): Reject --allow-mixed-revisions in combination with --reintegrate. Call svn_client_merge_peg4() and svn_client_merge4(). * subversion/svn/cl.h
