branchfile edited in branch new
Merge branch 'new'
index line added from master