Scott Taylor 5f77edf503 merge_tools: extract MergeToolFile struct ... I'm going to change the merge tools to accept multiple files, and this will make it easier to pass all the required data about each file.		2025-01-08 23:52:21 +00:00
..
examples	examples: use settings_for_new_workspace() when initializing workspace	2025-01-06 21:15:28 +09:00
src	merge_tools: extract MergeToolFile struct	2025-01-08 23:52:21 +00:00
testing	merge_tools: add "$marker_length" variable	2024-12-23 08:42:10 -06:00
tests	diff: add merge-tools.*.diff-expected-exit-codes	2025-01-08 08:03:59 +00:00
build.rs
Cargo.toml	cli: make git support optional	2025-01-08 22:02:21 +00:00
docs
LICENSE