# HG changeset patch
# User Henry S. Thompson <ht@markup.co.uk>
# Date 1672069032 0
# Node ID e74ed26675c9cec7b3202dff87ba3a3aed6a5d1c
# Parent  a2f8f184f2797af9854c986970542b197e524d1b
d

diff -r a2f8f184f279 -r e74ed26675c9 cc_2021/test
--- a/cc_2021/test	Mon Dec 26 15:35:38 2022 +0000
+++ b/cc_2021/test	Mon Dec 26 15:37:12 2022 +0000
@@ -12,3 +12,4 @@
 b
 b
 >>>>>>> merge rev
+