file2
file2; modified in master
file2
file2
file2
file2
file2
file2
file2
file2
file2; edited in branch
file2
file2
