Date: Sun, 28 Jun 2020 02:29:53 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r362714 - stable/12/usr.bin/sed/tests Message-ID: <202006280229.05S2Trgn021197@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Sun Jun 28 02:29:53 2020 New Revision: 362714 URL: https://svnweb.freebsd.org/changeset/base/362714 Log: Fix mismerge from r362687 Hex substitutions and the corresponding test case have not yet been merged back to this branch, but a mismerge added in the atf_add_test_case. Back out that line, it'll get re-added with the test shortly. Modified: stable/12/usr.bin/sed/tests/sed2_test.sh Modified: stable/12/usr.bin/sed/tests/sed2_test.sh ============================================================================== --- stable/12/usr.bin/sed/tests/sed2_test.sh Sun Jun 28 01:29:14 2020 (r362713) +++ stable/12/usr.bin/sed/tests/sed2_test.sh Sun Jun 28 02:29:53 2020 (r362714) @@ -113,5 +113,4 @@ atf_init_test_cases() atf_add_test_case inplace_symlink_src atf_add_test_case escape_subst atf_add_test_case commands_on_stdin - atf_add_test_case hex_subst }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006280229.05S2Trgn021197>