Yuya Nishihara dd26b7be40 merge: add Merge constructor that accepts interleaved values ... Also migrated some callers of 3-way merge, where [left, base, right] order looks okay.		2023-11-07 17:10:12 +09:00
..
examples	merged_tree: let backend influence whether to use new diff algo	2023-11-06 23:12:02 -08:00
src	merge: add Merge constructor that accepts interleaved values	2023-11-07 17:10:12 +09:00
testing	fake_diff_editor: Allow specifying extra arguments to be ignored	2023-08-21 20:19:15 -07:00
tests	merge: simply print interleaved conflict values in debug output	2023-11-06 07:21:06 +09: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	async: switch to pollster's block_on()	2023-11-03 08:15:10 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00