myfile4

myfile2
2 changed files with 5 additions and 1 deletions
--- a/cmc.txt
+++ b/cmc.txt
@ -0,0 +1,5 @@
+<<<<<<< HEAD
+nihao!!
+=======
+123456
+>>>>>>> 7f0713c0cf34d60e728087da8ecc86268339b486
--- a/新建文本文档.txt
+++ b/新建文本文档.txt
@ -1 +0,0 @@
-123456
Author	SHA1	Message	Date
张毓	64c8f978cb	myfile4	12 months ago
张毓	da8f1d6db6	myfile2	12 months ago