Merge branch 'fenzhi4' into fenzhi3

# Conflicts: # .3.txt update
fenzhi4修改
--- a/.3.txt
+++ b/.3.txt
@@ -1 +1,2 @@
 .3.3.3.3
 .3.3.3.3
 第二行来自fenzhi3修改，另一种来自fenzhi4修改
--- a/conflict.txt
+++ b/conflict.txt
@@ -0,0 +1,2 @@
 这是fenzhi4分支的内容
 第二行内容
--- a/hello.txt
+++ b/hello.txt
@@ -0,0 +1 @@
 hello
Author	SHA1	Message	Date
Wuxiaowen	6279de1102	Merge branch 'fenzhi4' into fenzhi3 # Conflicts: # .3.txt update	10 months ago
Wuxiaowen	f344d3b14c	fenzhi4修改	10 months ago
Wuxiaowen	0410b02f50	fenzhi3修改	10 months ago
Wuxiaowen	6d5b5006ad	在fenzhi4添加conflict	10 months ago
Wuxiaowen	bf242ea3c5	hello	10 months ago