* subversion/tests/cmdline/merge_tests.py
  (merge_two_edits_to_same_prop): Update comments.

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