* 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'.
* 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: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1438602 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion