Martin von Zweigbergk f8c016a8ea files: make MergeHunk support any number of removes and adds ... I think `files::merge()` will be a useful place to share code for resolving conflicting hunks after all. We'll want `MergeHunk` to support multi-way merges then.		2021-06-30 09:55:16 -07:00
..
benches	project: rename project from Jujube to Jujutsu	2021-05-15 10:28:40 -07:00
protos	cli: record full argv in operation log	2021-05-09 22:42:13 -07:00
src	files: make MergeHunk support any number of removes and adds	2021-06-30 09:55:16 -07:00
tests	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
build.rs	rustfmt: configure to group imports	2021-03-14 10:46:25 -07:00
Cargo.toml	cargo: update test-case to 1.2.0 now that frondeus/test-case#66 is fixed	2021-06-28 12:13:14 -07:00