2 changed files with 3 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,2 +1,3 @@
 111
-wenbeiyuan_branch1
+wenbeiyuan_branch1
+wenbeiyuan_branch2
--- a/2/2.txt
+++ b/2/2.txt
@ -0,0 +1 @@
+验证合并操作