From f86aabc46b685554d623f9f27a160bc1bbedea8d Mon Sep 17 00:00:00 2001 From: Max Edwards Date: Wed, 10 Sep 2025 17:51:25 +0100 Subject: [PATCH] this change will pass at first but will result in silent merge --- src/test/util_tests.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index f9038c4fc977..d57340578396 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -315,6 +315,7 @@ BOOST_AUTO_TEST_CASE(util_TrimString) BOOST_CHECK_EQUAL(TrimString("\t \n foo \n\tbar\t \n "), "foo \n\tbar"); BOOST_CHECK_EQUAL(TrimStringView("\t \n foo \n\tbar\t \n ", "fobar"), "\t \n foo \n\tbar\t \n "); BOOST_CHECK_EQUAL(TrimString("foo bar"), "foo bar"); + BOOST_CHECK_EQUAL(TrimString("silent_merge"), "silent_merge"); BOOST_CHECK_EQUAL(TrimStringView("foo bar", "fobar"), " "); BOOST_CHECK_EQUAL(TrimString(std::string("\0 foo \0 ", 8)), std::string("\0 foo \0", 7)); BOOST_CHECK_EQUAL(TrimStringView(std::string(" foo ", 5)), std::string("foo", 3));