git: Use meld for merge conflicts
This commit is contained in:
parent
f7bb387c77
commit
ffc92a6671
1 changed files with 1 additions and 1 deletions
|
|
@ -51,7 +51,7 @@ date = iso
|
|||
[merge]
|
||||
conflictStyle = zdiff3
|
||||
ff = only
|
||||
tool = nvimdiff
|
||||
tool = meld
|
||||
|
||||
[pager]
|
||||
difftool = true
|
||||
|
|
|
|||
Loading…
Reference in a new issue