Yuya Nishihara 895bbce8c0 files: use borrowed Merge iterator in merge() ...

Since the underlying Merge data type is no longer (Vec<T>, Vec<T>), it doesn't
make sense to build removes/adds Vecs and concatenate them.

2023-11-07 06:52:35 +09:00

..

examples

backend: make read_conflict synchronous again

2023-10-28 16:45:40 -07:00

src

files: use borrowed Merge iterator in merge()

2023-11-07 06:52:35 +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