1 éve · 468f5f5c22
--- a/file1.txt
+++ b/file1.txt
@@ -1,2 +1,3 @@
 
															 some info
														
 
															 minor change
														
 
															+added new line while in branch test1
														
--- a/guide.txt
+++ b/guide.txt
@@ -1 +1,2 @@
 
															+create a conflict adding this line
														
 
															 a line
	`@@ -1 +1,2 @@`
			`+create a conflict adding this line`
	`a line`		`a line`