commit e423877dd3fa76444ef448d4272a9f6d3ff32b54
from: Stefan Sperling <stsp@stsp.name>
date: Thu May 11 05:21:13 2023 UTC

properly report a test failure care in test_patch_merge_conflict

commit - c000aa350eac5ac329beb278a513e5f978d2a463
commit + e423877dd3fa76444ef448d4272a9f6d3ff32b54
blob - 17d3810a7849186809369d7245dafdba62ab2db7
blob + f8f96458bc264b17a74e776857380fbf625c03d2
--- regress/cmdline/patch.sh
+++ regress/cmdline/patch.sh
@@ -1522,7 +1522,7 @@ test_patch_merge_conflict() {
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got patch merged a diff that should conflict" >&2
-		test_done $testroot 0
+		test_done $testroot 1
 		return 1
 	fi