results of straightforward merge
now tut.txt is there on the branch
moving br1 along
ready to push to remote br1
need to get all the changes in br1
merged changes in br1
diffs get added to the files