# HG changeset patch
# User Henry S. Thompson <ht@markup.co.uk>
# Date 1672068938 0
# Node ID a2f8f184f2797af9854c986970542b197e524d1b
# Parent  79c9133832a1667c3092b2e2b3ad50e1357617d0# Parent  01c16bfcf4ee99d951ee80117b072d8e247b0763
merge

diff -r 79c9133832a1 -r a2f8f184f279 cc_2021/test
--- a/cc_2021/test	Mon Dec 26 15:34:49 2022 +0000
+++ b/cc_2021/test	Mon Dec 26 15:35:38 2022 +0000
@@ -4,4 +4,11 @@
 b
 b
 
+<<<<<<< working copy
 
+=======
+b
+b
+b
+b
+>>>>>>> merge rev