diff --git a/config/jj/config.toml b/config/jj/config.toml index cd0e0c3..5ebfbec 100644 --- a/config/jj/config.toml +++ b/config/jj/config.toml @@ -9,7 +9,6 @@ default-command = "l" editor = "nvim" pager = "delta" diff-formatter = ":git" -merge-editor = ["nvim", "-d"] [signing] backend = "ssh"