branch in branch

This commit is contained in:
didier amyot committed 2015-07-29 14:55:12 -04:00
1 parent ba1ec74617
commit 2267d4b2a5
1 file changed
+4
+4
View File
@@ -3,3 +3,7 @@ this is a text file.
THIS IS NOT AN ERROR AND MUST BE IN HISTORY. THIS IS NOT AN ERROR AND MUST BE IN HISTORY.
this has been changed in branch_b this has been changed in branch_b
in a branch in a branch