1234567890
<<<<<<< HEAD
abcdefghijk
=======
b45678910
>>>>>>>
hello word!
- <<<<<<<与=======之间的内容是我的修改;
- =======与>>>>>>>之间的内容是别人的修改的修改;
1234567890
<<<<<<< HEAD
abcdefghijk
=======
b45678910
>>>>>>>
hello word!
转载于:https://www.cnblogs.com/bobi1234/p/7461133.html