Watch
1
0
Fork
You've already forked dotfiles
0

git: Use meld for merge conflicts

This commit is contained in:
Jeremy Kaplan 2026-10-17 14:06:13 -04:00
commit ffc92a6671

View file

@ -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