commit cdba74ba3b79256e0094f4a6ec4ed4601806cba6
from: Thomas Adam <thomas@xteddy.org>
date: Tue Nov 23 13:22:08 2021 UTC

portable: enable merge.sh

This seemingly went walkies, so reenabling it.

commit - c3f0d5676d12c478f7af883f887177474081de36
commit + cdba74ba3b79256e0094f4a6ec4ed4601806cba6
blob - 5512a52281c0ee03946db793d6cf3bc079bef0f4
blob + cad0455ed2f574e43f4f29930658204783d907c4
--- Makefile.am
+++ Makefile.am
@@ -38,6 +38,7 @@ regress-cmdline:
 	./import.sh -r "$(GOT_TEST_ROOT)";			\
 	./histedit.sh -r "$(GOT_TEST_ROOT)";			\
 	./integrate.sh -r "$(GOT_TEST_ROOT)";			\
+	./merge.sh -r "$(GOT_TEST_ROOT)"; 			\
 	./stage.sh -r "$(GOT_TEST_ROOT)";			\
 	./unstage.sh -r "$(GOT_TEST_ROOT)"; 			\
 	./cat.sh -r "$(GOT_TEST_ROOT)"; 			\