SHA1
--- a/README
+++ b/README
@@ -0,0 +1 @@
 
				+add README in this repo
			
--- a/file1.txt
+++ b/file1.txt
@@ -1,3 +1,9 @@
 
				 some info
			
 
				 minor change
			
 
				+
			
 
				 added new line while in branch test1
			
 
				+
			
 
				+add a line in branch master
			
 
				+another line
			
 
				+yet another line
			
 
				+
作者	SHA1 备注	提交日期
a	14d9f7225e resolve conflict in file1 while merging master to test1	1 年之前
a	2392cb07ac add README and modify file1	1 年之前