* subversion/tests/libsvn_client/conflicts-test.c   (test_merge_incoming_chained_move_local_edit): Update the comment in    this test.  The test used to fail, but passes now.
* subversion/tests/libsvn_client/conflicts-test.c
  (test_merge_incoming_chained_move_local_edit): Update the comment in
   this test.  The test used to fail, but passes now.


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

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