On the 1.5.x-r37779 branch, merge r37779 from trunk.
* subversion/libsvn_client/merge.c
* subversion/tests/cmdline/merge_tests.py
Resolve some minor text conflicts.
* src-branch-1.5.x-3
* CHANGES
* COMMITTERS
* notes/tree-conflicts/scratch-pad.txt
* subversion/bindings/swig
* subversion/include/private
* subversion/libsvn_subr
* subversion/libsvn_wc/adm_ops.c
* subversion/tests/cmdline/svntest/actions.py
* www/images/subversion-diagram.png
* www/images/subversion_logo-200x173.png
* www/images/subversion_logo-384x332.png
* www/images/subversion_logo_hor-468x64.png
Mergeinfo updates.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r37779@877856 13f79535-47bb-0310-9956-ffa450edef68
2 files changed
