Merge remote-tracking branch 'origin/origin/dev1' into origin/dev2
提交
Merge branch 'origin/dev1' into origin/dev2

Conflicts:
	111.txt
Merge branch 'origin/dev2' into origin/dev1