Mercurial > hg > hstweb

changeset 69:a2f8f184f279

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Henry S. Thompson <ht@markup.co.uk>
date Mon, 26 Dec 2022 15:35:38 +0000
parents 79c9133832a1 (current diff) 01c16bfcf4ee (diff)
children e74ed26675c9
files cc_2021/test
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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