freebsd-git-docs icon indicating copy to clipboard operation
freebsd-git-docs copied to clipboard

Published 20 hours ago • verified publisher icon bsdimp

Should document merge.conflictstyle = diff3

Open bsdjhb opened this issue 4 years ago • 0 comments

I think we patched subversion in FreeBSD to default to diff3 style conflicts instead of diff2. Git defaults to diff2, but can be changed to use diff3 via this snippet in .gitconfig:

[merge]
	conflictstyle = diff3

We should document this somewhere.

bsdjhb avatar Jan 05 '21 17:01 bsdjhb