test branch new, delete, rename
delete file
Merge branch 'b1'
mod file1