# HG changeset patch
# User Henry S. Thompson <ht@markup.co.uk>
# Date 1672069608 0
# Node ID 38eb937d4141c992e485d27c3d46f46934b58b9c
# Parent  99923eafc34d1e14a14353d1619f46a282fabc2c
d

diff -r 99923eafc34d -r 38eb937d4141 cc_2021/test
--- a/cc_2021/test	Mon Dec 26 15:39:08 2022 +0000
+++ b/cc_2021/test	Mon Dec 26 15:46:48 2022 +0000
@@ -14,3 +14,4 @@
 >>>>>>> merge rev
 
 
+c