我在working分支更改了哦
w modify
master modify
conflict fixed
working test
master test2
conflict fixed