.

Merge branch 'fenzhi1' into fenzhi2
# Conflicts: # 111.txt
--- a/111.txt
+++ b/111.txt
@@ -1 +1,14 @@
 111
 111
 <<<<<<< HEAD
 第二次提交
 <<<<<<< HEAD
 第三次提交
 =======
 111
 >>>>>>> parent of 5dc0dca (第二次提交)
 =======
 第二次提交
 >>>>>>> parent of 8f28ae7 (第三次提交)
 =======
 第三次提交
 >>>>>>> parent of f9323af (3次)
--- a/222.txt
+++ b/222.txt
@@ -0,0 +1 @@
 222
--- a/hello.txt
+++ b/hello.txt
@@ -1 +1,2 @@
 hello
 hello
 fenzhi1修改
Autor	SHA1	Mensagem	Data
Wuxiaowen	c0c50d0ba9	.	11 meses atrás
Wuxiaowen	213e6f7011	Merge branch 'fenzhi1' into fenzhi2 # Conflicts: # 111.txt	11 meses atrás
Wuxiaowen	62ab95dd05	解决	11 meses atrás
Wuxiaowen	f9323aff5e	3次	11 meses atrás
Wuxiaowen	8f28ae7b74	第三次提交	11 meses atrás
Wuxiaowen	5dc0dca675	第二次提交	11 meses atrás
Wuxiaowen	bed872ed00	Merge branch 'fenzhi2' into fenzhi1 # Conflicts: # hello.txt	11 meses atrás
Wuxiaowen	70093b23da	fenzhi1修改	11 meses atrás
Wuxiaowen	d33fa45fab	fenzhi2修改	11 meses atrás
Wuxiaowen	40274ce759	222	11 meses atrás
Wuxiaowen	3c2fdc99ab	111	11 meses atrás