Skip to content
Snippets Groups Projects
Commit 974c60c0 authored by nimrod's avatar nimrod
Browse files

Set the git conflictstyle.

parent 3cc98d00
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
.config/git/config
+ 1
− 0
View file @ 974c60c0
......@@ -76,6 +76,7 @@
defaultBranch = master
[merge]
conflictstyle = zdiff3
ff = false
tool = meld
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment