冲突如通常所示:
<<<<<<< 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
然而,我再找不到选择。 谁能帮助我?