mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-24 23:47:22 +00:00
f8c016a8ea
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. |
||
---|---|---|
.. | ||
benches | ||
protos | ||
src | ||
tests | ||
build.rs | ||
Cargo.toml |