Synch the 1.6.x-issue3432 backport branch up with 1.6.x so it can once
again be reintegrated without conflicts.
* subversion/libsvn_client/merge.c
* subversion/tests/cmdline/merge_tests.py
Resolve some minor conflicts in these two files caused by other changes
backported to 1.6.x since the issue 3432 fixes were nominated 100 years
ago.
All other changes are just part of the sync.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3432@923910 13f79535-47bb-0310-9956-ffa450edef68
