* subversion/tests/cmdline/basic_tests.py
  (automatic_conflict_resolution):
     Revert accidental comment change in r1623760.

Found by: arfrever


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