screwball in index -- master branch
math file -- new one in master
dummy file -- new one in mario branch
Merge branch 'mario'
added flasks in test-file -- master
new file called fiction put in
test-b branch -- fiction content is now foo
master branch -- fiction content is now foo
Merge branch 'test-B'
commit-C -- in test-B branch -- trivial change in index
master branch -- after first merge with test-B branch -- foobar now content of fiction
second merge of test-B into master
commit-D -- in test-B branch -- baz the curent content of fiction
commit-O -- third merge of test-B into master -- foobarbaz now the content of fiction
logger -- changed -- added one silly line
silly 1-line change in logger -- test-B branch
commit P -- fourth merge of test-B into master -- merging harmless 1-line changes to logger
added order.txt to gitignore -- this is used for testing git log -Oorder.txt --- branch master
order.txt renamed to diff-patch-order-file.txt -- used as git log -Odiff-patch-order-file.txt -- in master
added line in index.html -- in master branch