mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-24 07:32:54 +00:00
04158c3744
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. |
||
|---|---|---|
| .. | ||
| examples | ||
| src | ||
| testing | ||
| tests | ||
| build.rs | ||
| Cargo.toml | ||
| LICENSE | ||