Martin von Zweigbergk d2cf2cb768 async: bubble up async-ness from Backend::read_file		2025-05-20 22:07:03 +00:00
..
examples	backend: make read_file() return a AsyncRead	2025-05-20 13:23:36 +00:00
src	async: bubble up async-ness from Backend::read_file	2025-05-20 22:07:03 +00:00
testing	diff: Run external diff tools in their temp dir	2025-05-12 21:34:19 +00:00
tests	cli: resolve: show a hint towards editing the conflict markers manually if the conflict has >2 sides	2025-05-20 18:11:43 +00:00
build.rs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
Cargo.toml	backend: make read_file() return a AsyncRead	2025-05-20 13:23:36 +00:00
docs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
LICENSE