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]
|
[merge]
|
||||||
conflictStyle = zdiff3
|
conflictStyle = zdiff3
|
||||||
ff = only
|
ff = only
|
||||||
tool = nvimdiff
|
tool = meld
|
||||||
|
|
||||||
[pager]
|
[pager]
|
||||||
difftool = true
|
difftool = true
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue