Ilya Grigoriev 04158c3744 External merge tools: better error message for unsupported usage ... I've heard of one instance of a person being confused by the error. Previously, the error was: ``` Error: Failed to load tool configuration Caused by: To use `diffedit3` as a merge tool, the config `merge-tools.diffedit3.merge-args` must be defined (see docs for details) ``` Now, it is: ``` Error: The tool `diffedit3` cannot be used as a merge tool with `jj resolve`. Hint: To use `diffedit3` as a merge tool, the config `merge-tools.diffedit3.merge-args` must be defined (see docs for details) ``` TODO for future PR: allow setting `merge-tools.TOOL.edit-args = false` so that attempting to use TOOL as a diff editor fails. This would be helpful, for example, for the `vscode` tool.		2024-05-05 18:33:53 -07:00
..
examples	revset: add a SymbolResolverExtension trait to provide custom resolvers	2024-04-26 10:55:34 -04:00
src	External merge tools: better error message for unsupported usage	2024-05-05 18:33:53 -07:00
testing
tests	cli: show hint for inner fileset/revset/template errors	2024-05-05 11:16:17 +09:00
build.rs
Cargo.toml
LICENSE