branch2

Merge branch 'branch1'
branch1
2 changed files with 3 additions and 0 deletions
--- a/1.txt
+++ b/1.txt
@ -0,0 +1 @@
+巴卡巴卡
--- a/22.txt
+++ b/22.txt
@ -0,0 +1,2 @@
+branch1
+branch2
Author	SHA1	Message	Date
黎萍	96abf573c9	branch2	1 year ago
黎萍	122fd82387	Merge branch 'branch1'	1 year ago
黎萍	412b70e2b5	branch1	1 year ago
黎萍	5267c3f724	新增信息	1 year ago