On the 1.5.x-issue3067 backport branch, merge r31927 from trunk.

* subversion/tests/cmdline/merge_tests.py
* subversion/libsvn_client/merge.c
  Clean merge.

* src-branch-3067, CHANGES, COMMITTERS, subversion/bindings/swig:
  Mergeinfo updates.



git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-issue3067@872196 13f79535-47bb-0310-9956-ffa450edef68
2 files changed