Waleed Khan 4bb40bbf10 merge_tools: create merge_tools directory ... The intention is to put the internal and external merge tool implementations in different files.		2023-08-13 16:21:05 -04:00
..
examples	cargo: move examples/ into cli/ so they are part of the build again	2023-08-07 21:49:45 +00:00
src	merge_tools: create merge_tools directory	2023-08-13 16:21:05 -04:00
testing
tests	cli: add support for setting default description	2023-08-13 23:59:15 +05:30
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: unify a lot of crate metadata in the workspace	2023-08-06 16:44:33 -05:00