Ilya Grigoriev 1fd421f42c merge_tools.toml: add a comment to meld-3 definition ... In https://github.com/martinvonz/jj/pull/2665#issuecomment-1837552283, a user used `$base` instead of one of the `$output`s and nothing worked. This seems like a natural mistake to make, the config is confusing.		2023-12-03 17:56:10 -08:00
..
examples
src	merge_tools.toml: add a comment to meld-3 definition	2023-12-03 17:56:10 -08:00
testing
tests
build.rs
Cargo.toml
LICENSE