on a branch

2015-06-09 15:13:45 -04:00
3 changed files with 1 additions and 10 deletions
@@ -1,4 +0,0 @@
 this is a better message in the "foo" file.
 this line has been written in branch_a
@@ -2,8 +2,4 @@ this is a text file.
 THIS IS NOT AN  ERROR AND MUST BE IN HISTORY.
-this has been changed in branch_b
+On a separate branch
 in a branch in a branch
@@ -1 +0,0 @@
 rienk ca!
		`@@ -1,4 +0,0 @@`
			`this is a better message in the "foo" file.`


			`this line has been written in branch_a`