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

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