Author: rhuijben
Date: Thu Aug 30 21:20:16 2018
New Revision: 1839704
URL: http://svn.apache.org/viewvc?rev=1839704&view=rev
Log:
* subversion/tests/libsvn_client/conflicts-test.c
(test_cherry_pick_post_move_edit): Remove unneeded C++ comment.
Modified:
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1839704&r1=1839703&r2=1839704&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Thu Aug 30
21:20:16 2018
@@ -5019,7 +5019,6 @@ test_cherry_pick_post_move_edit(const sv
/* And "A1/mu" should have expected contents. */
SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A1/mu"), pool));
- //DebugBreak();
SVN_TEST_STRING_ASSERT(buf->data,
"<<<<<<< .working" "\n"
"This is the file 'mu'." "\n"
