* subversion/tests/libsvn_client/conflicts-test.c   (test_funcs): Ensure the merge/update/switch operation is always mentioned    in test descriptions.
* subversion/tests/libsvn_client/conflicts-test.c
  (test_funcs): Ensure the merge/update/switch operation is always mentioned
   in test descriptions.


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

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