in branch A

2015-07-16 13:01:56 -04:00
1 parent c14accc9b3
commit 88792ca073
@@ -1,2 +1,4 @@
 this is a better message in the "foo" file.
 this line has been written in branch_a
`@@ -1,2 +1,4 @@`
	`this is a better message in the "foo" file.`	`this is a better message in the "foo" file.`


	`this line has been written in branch_a`	`this line has been written in branch_a`