3 changed files with 6 additions and 3 deletions
--- a/111.txt
+++ b/111.txt
@ -1,5 +1,5 @@
 111
 develop
 a_branch
-333
-develop
+5555
+wny_branch
--- a/doc/1.txt
+++ b/doc/1.txt
@ -1 +1,4 @@
-11
+11
+22
+33
+wny_branch
--- a/doc/冲突.docx
+++ b/doc/冲突.docx