* subversion/tests/cmdline/merge_tests.py
  (merge_automatic_conflict_resolution): Remove an obsolete comment.

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