git:如何获得合并冲突的"我们的,他们的,原创的"？

Question

Git合并冲突通常如下所示:

<<<<<<< HEAD:file.txt
Code changed by A
=======
Code changed by B
>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt

但是,我知道有可能(使用一些git配置选项)也可以显示原始代码,而不仅仅是更改.就像是:

<<<<<<< HEAD:file.txt
Code changed by A
=======
Original code
=======
Code changed by B
>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt

但是,我再也找不到这个选项......任何人都可以帮我解决？

Answer 1

没关系,我刚刚找到了解决方案:

git config --global merge.conflictstyle diff3

它实际上看起来像这样:

<<<<<<< HEAD:file.txt
Code changed by A
||||||| merged common ancestors
Original code
=======
Code changed by B
>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt