mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-07 13:00:08 +00:00
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. |
||
---|---|---|
.. | ||
commands | ||
config | ||
merge_tools | ||
cleanup_guard.rs | ||
cli_util.rs | ||
command_error.rs | ||
commit_templater.rs | ||
complete.rs | ||
config-schema.json | ||
config.rs | ||
description_util.rs | ||
diff_util.rs | ||
formatter.rs | ||
generic_templater.rs | ||
git_util.rs | ||
graphlog.rs | ||
lib.rs | ||
main.rs | ||
movement_util.rs | ||
operation_templater.rs | ||
progress.rs | ||
revset_util.rs | ||
template.pest | ||
template_builder.rs | ||
template_parser.rs | ||
templater.rs | ||
text_util.rs | ||
time_util.rs | ||
ui.rs |