mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-01 00:50:57 +00:00
9cc8b35251
This will give us more fine-grained control over what files we put in the index, allowing us to create conflicted index states. We also still need to use git2 to clean up the merge/rebase state, since gix doesn't have any function for this currently. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
proc-macros | ||
src | ||
tests | ||
testutils | ||
Cargo.toml | ||
LICENSE |