Merge r1441810 from ^/subversion/trunk.

* src-branch-1.7.x: Mergeinfo changes only

* subversion/libsvn_client/merge.c: Clean merge of r1441810.

* subversion/tests/cmdline/merge_tests.py
  (conflict_aborted_mergeinfo_described_partial_merge): r1441810 replaced
   the earlier version of this test, which used text conflicts, with an
   expanded version that used property conflicts to resolve the issue
   raised here: http://svn.haxx.se/dev/archive-2013-02/0001.shtml
   Unfortunately, 1.7.x has unrelated problems with property conflicts: It 
   doesn't abort the merge if it encounters them!  It merrily plugs along
   sans any "One or more conflicts were produced while merging...resolve
   all conflicts and rerun the merge to apply the remaining unmerged
   revisions" error.  So while r1441810 is a valid fix (IMO) its test fails
   for unrelated reasons.  So I reworked the earlier version of test to
   demonstrate the problem r1441810 fixes, but using file conflicts.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4306@1442367 13f79535-47bb-0310-9956-ffa450edef68