delete another-file
dif-file
trial adding another file
delete another
Merge branch 'newfolder'
trial trial
trial