mirror of
https://github.com/olexsmir/dotfiles.git
synced 2026-01-15 08:41:34 +02:00
jj: use builtin merge-editor
This commit is contained in:
parent
b406c8f09c
commit
eb21be2201
1 changed files with 0 additions and 1 deletions
|
|
@ -9,7 +9,6 @@ default-command = "l"
|
||||||
editor = "nvim"
|
editor = "nvim"
|
||||||
pager = "delta"
|
pager = "delta"
|
||||||
diff-formatter = ":git"
|
diff-formatter = ":git"
|
||||||
merge-editor = ["nvim", "-d"]
|
|
||||||
|
|
||||||
[signing]
|
[signing]
|
||||||
backend = "ssh"
|
backend = "ssh"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue