Merge branch 'dev2'

# Conflicts: # 1.txt # 2.txt
修改
--- a/1.txt
+++ b/1.txt
@@ -1 +1 @@
 1111
 11
--- a/2.txt
+++ b/2.txt
@@ -1 +1 @@
 22
 2
--- a/4.txt
+++ b/4.txt
@@ -0,0 +1 @@
 4444
--- a/6.txt
+++ b/6.txt
@@ -0,0 +1 @@
 666
Author	SHA1	Message	Date
永攀张	47e4e486cf	Merge branch 'dev2' # Conflicts: # 1.txt # 2.txt	2 days ago
永攀张	e518adc097	修改	2 days ago
永攀张	077c6f2dd2	Merge branch 'dev1'	2 days ago
永攀张	469ca946e4	修改	2 days ago
永攀张	d063fc572f	Merge branch 'dev1' # Conflicts: # 1.txt	2 days ago
永攀张	c5bc8eb72b	添加6	2 days ago
永攀张	c5de2f5ec5	添加4.txt	2 days ago
永攀张	33f8d9587c	提交文件	2 days ago