The post mentions merge.conflictStyle but one thing I would like to see git steal from BitKeeper is the unified diff conflict style. See the first example in t

The post mentions merge.conflictStyle but one thing I would like to see git steal from BitKeeper is the unified diff conflict style. See the first example in this manpage: https://www.bitkeeper.org/man/smerge.html https://www.bitkeeper.org/man/smerge.html But we never managed to get that used much as you can infer by this help: -g Enable 'gca' output format that shows the local and remote files like a unified diff between the GCA and that file. This is the recommended output format, but not the default because it con- fuses people the first time they see it. You have to do more editing to resolve the conflict, but what changed is a lot more obvious.