commit 8e6eb32a6fc7af2d3bb89aebad7f5f9ae122b017
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Sun May 14 11:47:50 2023 UTC

properly report a test failure care in test_patch_merge_conflict

commit - c806df28bc81288e1e60327e195df70b54ccfe38
commit + 8e6eb32a6fc7af2d3bb89aebad7f5f9ae122b017
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