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	gc: implement basic GC for Git backend	2023-12-03 07:40:12 -08:00
src	merge_tools.toml: add a comment to meld-3 definition	2023-12-03 17:56:10 -08:00
testing	fake_diff_editor: Allow specifying extra arguments to be ignored	2023-08-21 20:19:15 -07:00
tests	test_abandon_command: create another test for bug 2600	2023-12-01 17:03:44 -08:00
build.rs	build: update rerun-if conditions to watch .git/HEAD in colocated repo	2023-08-06 12:16:11 +09:00
Cargo.toml	cargo: sort dependencies list alphabetically	2023-11-07 23:46:05 +09:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00