Git合并冲突通常显示如下:
然而,我知道有可能(通过一些
然而,我再也找不到这个选项了。有人能帮帮我吗?
<<<<<<< HEAD:file.txt
Code changed by A
=======
Code changed by B
>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt
然而,我知道有可能(通过一些
git config
选项)同时显示原始代码和更改内容。类似于:<<<<<<< HEAD:file.txt
Code changed by A
=======
Original code
=======
Code changed by B
>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt
然而,我再也找不到这个选项了。有人能帮帮我吗?