squashed commit

in branch_2
2016-01-25 14:07:55 -05:00 · 2015-10-01 14:19:23 -04:00 · 2015-10-01 14:18:44 -04:00 · 2015-10-01 14:18:34 -04:00 · 2015-10-01 14:16:57 -04:00 · 2015-10-01 14:16:43 -04:00
2 changed files with 13 additions and 0 deletions
@@ -1 +1,3 @@
 this is a better message in the "foo" file.
+
+In branch 2
@@ -1,3 +1,14 @@
 this is a text file.

 THIS IS NOT AN  ERROR AND MUST BE IN HISTORY.
+
+In branch 1
+In branch 1 too
+
+In master
+
+In branch 2
+
+hjdssdi
+
+saksd sdjhjksd
Author	SHA1	Message	Date
didier amyot	90103f7b7a	squashed commit	2016-01-25 14:07:55 -05:00
didier amyot	e9ec370227	in branch_2	2015-10-01 14:19:23 -04:00
didier amyot	cd029ca554	in branch_2	2015-10-01 14:18:44 -04:00
didier amyot	ffaea8b066	in master	2015-10-01 14:18:34 -04:00
didier amyot	f2325b6282	in branch_1 too	2015-10-01 14:16:57 -04:00
didier amyot	8c80de0054	in branch_1	2015-10-01 14:16:43 -04:00