diff --git a/CHANGELOG.md b/CHANGELOG.md index bb76edb4729..9f8a222de8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). expand `~/` to `$HOME/`. [#5626](https://github.com/jj-vcs/jj/pull/5626) +* `config-schema.json` now allows arrays of strings for the settings `ui.editor` + and `ui.diff.tool`. + ## [0.26.0] - 2025-02-05 ### Release highlights diff --git a/cli/src/config-schema.json b/cli/src/config-schema.json index 2e0f03f419a..641bd5a7845 100644 --- a/cli/src/config-schema.json +++ b/cli/src/config-schema.json @@ -98,7 +98,21 @@ "default": "auto" }, "pager": { - "type": "string", + "type": ["array", "object", "string"], + "items": { + "type": "string" + }, + "properties": { + "command": { + "type": ["array", "string"], + "items": { + "type": "string" + } + }, + "env": { + "type": "object" + } + }, "description": "Pager to use for displaying command output", "default": "less -FRX" }, @@ -140,7 +154,10 @@ "default": "color-words" }, "tool": { - "type": "string", + "type": ["array", "string"], + "items": { + "type": "string" + }, "description": "External tool for generating diffs" } } @@ -177,7 +194,10 @@ "default": true }, "editor": { - "type": "string", + "type": ["array", "string"], + "items": { + "type": "string" + }, "description": "Editor to use for commands that involve editing text" }, "diff-editor": {