22

push
Merge branch 'branch2'
1 changed files with 4 additions and 1 deletions
--- a/hh.txt
+++ b/hh.txt
@ -1 +1,4 @@
-branch1
+branch13
+branch2
+12
+
Author	SHA1	Message	Date
HRZ	4aab1c3484	22	1 day ago
HRZ	f5ea892de9	push	1 day ago
HRZ	aa7dbf3042	Merge branch 'branch2' # Conflicts: # hh.txt	1 day ago
HRZ	bb4cbd6f31	2	1 day ago
HRZ	5d497e7d41	删除hh2.txt文件	1 day ago
HRZ	8486d60d2c	branch2	2 days ago