* subversion/tests/cmdline/merge_tests.py
  (conflict_aborted_mergeinfo_described_partial_merge): New test for
   issue #4306 'multiple editor drive merges record wrong mergeinfo
   during conflicts'.




git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1438602 13f79535-47bb-0310-9956-ffa450edef68