Merge commit '4c308f0e436880f762451b9fbdbda38a85644b6e'

author Paul Hänsch <paul@plutz.net>

Fri, 30 Aug 2024 20:02:10 +0000 (22:02 +0200)

committer Paul Hänsch <paul@plutz.net>

Fri, 30 Aug 2024 20:02:10 +0000 (22:02 +0200)
author Paul Hänsch <paul@plutz.net>
Fri, 30 Aug 2024 20:02:10 +0000 (22:02 +0200)
committer Paul Hänsch <paul@plutz.net>
Fri, 30 Aug 2024 20:02:10 +0000 (22:02 +0200)
diff --cc cgilite/markdown.awk
Simple merge
diff --cc cgilite/tests-markdown.sh

index 0000000000000000000000000000000000000000,2bbcf5dfa40645bc71ede3626c3c552dee304444..2bbcf5dfa40645bc71ede3626c3c552dee304444

mode 000000,100755..100755
--- /dev/null
--- 2/tests-markdown.sh
+++ b/cgilite/tests-markdown.sh
author	Paul Hänsch <paul@plutz.net>
	Fri, 30 Aug 2024 20:02:10 +0000 (22:02 +0200)
committer	Paul Hänsch <paul@plutz.net>
	Fri, 30 Aug 2024 20:02:10 +0000 (22:02 +0200)
		1	2
cgilite/markdown.awk	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/tests-markdown.sh	patch \|	\|	diff2 \|	blob \| history