Commit 974c60c0 authored by nimrod's avatar nimrod
Browse files

Set the git conflictstyle.

parent 3cc98d00

.config/git/config

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
    defaultBranch = master



[merge]

    conflictstyle = zdiff3

    ff = false

    tool = meld