Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Should document merge.conflictstyle = diff3 #75

Open
bsdjhb opened this issue Jan 5, 2021 · 0 comments
Open

Should document merge.conflictstyle = diff3 #75

bsdjhb opened this issue Jan 5, 2021 · 0 comments

Comments

@bsdjhb
Copy link
Contributor

bsdjhb commented Jan 5, 2021

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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@bsdjhb