* subversion/tests/cmdline/merge_tests.py   (merge_binary_file_with_keywords): Adjust to better match the issue, and add     notes.
* subversion/tests/cmdline/merge_tests.py
  (merge_binary_file_with_keywords): Adjust to better match the issue, and add
    notes.

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

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