SHA1
--- a/file1.txt
+++ b/file1.txt
@@ -1,5 +1,9 @@
 
				 some info
			
 
				 minor change
			
 
				+
			
 
				+added new line while in branch test1
			
 
				+
			
 
				 add a line in branch master
			
 
				 another line
			
 
				 yet another line
			
 
				+
			
--- a/guide.txt
+++ b/guide.txt
@@ -1 +1,8 @@
 
				+create a conflict adding this line
			
 
				 a line
			
 
				+back in branch test1 adding this line
			
 
				+ok
			
 
				+new
			
 
				+1
			
 
				+1
			
 
				+1
作者	SHA1 备注	提交日期
a	14d9f7225e resolve conflict in file1 while merging master to test1	1 年之前
a	21f5b8c4cb add multiple lines in guide	1 年之前
a	468f5f5c22 add new lines in file1 and guide	1 年之前