issue7513 edit file1 file2
edit1 b 9
Merge branch 'branch1'
add gitignore
edit2 a 2