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

diff -r e74ed26675c9 -r 99923eafc34d cc_2021/test
--- a/cc_2021/test	Mon Dec 26 15:37:12 2022 +0000
+++ b/cc_2021/test	Mon Dec 26 15:39:08 2022 +0000
@@ -13,3 +13,4 @@
 b
 >>>>>>> merge rev
 
+