On the 1.7.x-issue4306 branch: Follow-up to r1442367.

* subversion/tests/cmdline/merge_tests.py
  (conflict_aborted_mergeinfo_described_partial_merge): Revert the 1.7
   version of this test I added in r1442367 and replace it with a new one
   that more closely mimics the trunk version of the test. See
   http://svn.haxx.se/dev/archive-2013-02/0062.shtml


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