rev4@remote1
cc
test
commit@master2
Merge branch 'origin/master'

Conflicts:
	dir1/file1.txt
cc
Merge branch 'origin/master'

Conflicts:
	dir1/file1.txt