add file1.txt
change from b1
Merge branch 'b1' of github.com:randomnaja/testgitrebase into b1