* subversion/tests/cmdline/merge_tests.py   (merge_one_file_helper, merge_with_implicit_target_helper): Fix doc strings.
* subversion/tests/cmdline/merge_tests.py
  (merge_one_file_helper, merge_with_implicit_target_helper): Fix doc strings.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1215093 13f79535-47bb-0310-9956-ffa450edef68

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