Yuya Nishihara f1898a31b5 merge: simply print interleaved conflict values in debug output ... We could apply that for the resolved case, but Resolved/Conflicted label seems more useful than just printing Merge([value]).		2023-11-06 07:21:06 +09:00
..
examples	backend: make read_conflict synchronous again	2023-10-28 16:45:40 -07:00
src	merge_tools: do not follow or change permission of symlinks	2023-11-06 07:20:52 +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