第三次修改

Merge branch 'branch1'
# Conflicts: # branch1.txt
1 changed files with 7 additions and 0 deletions
--- a/branch1.txt
+++ b/branch1.txt
@ -1 +1,8 @@
 branch1
+<<<<<<< HEAD
+master1
+=======
+第二次修改branch1
+>>>>>>> branch1
+
+第三次修改
Author	SHA1	Message	Date
15336219203	6b0878a958	第三次修改	11 months ago
15336219203	1852f39b8c	Merge branch 'branch1' # Conflicts: # branch1.txt	11 months ago
15336219203	3918a160dd	第二次修改branch1	11 months ago
15336219203	02931a7d16	添加master1	11 months ago