mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-26 06:01:48 +00:00
1b658ea80e
Fixes #2476. Previously, if there was a change id match within the short prefix lookup set, `jj` would not look for commits with that same change id outside the short prefix set. So, it wouldn't find the conflicted commits for a commit with a divergent (AKA conflicted) change id. |
||
---|---|---|
.. | ||
runner.rs | ||
test_bad_locking.rs | ||
test_commit_builder.rs | ||
test_commit_concurrent.rs | ||
test_conflicts.rs | ||
test_default_revset_graph_iterator.rs | ||
test_diff_summary.rs | ||
test_git.rs | ||
test_git_backend.rs | ||
test_gpg.rs | ||
test_id_prefix.rs | ||
test_index.rs | ||
test_init.rs | ||
test_load_repo.rs | ||
test_local_working_copy.rs | ||
test_local_working_copy_concurrent.rs | ||
test_local_working_copy_sparse.rs | ||
test_merge_trees.rs | ||
test_merged_tree.rs | ||
test_mut_repo.rs | ||
test_operations.rs | ||
test_refs.rs | ||
test_revset.rs | ||
test_rewrite.rs | ||
test_rewrite_transform.rs | ||
test_signing.rs | ||
test_ssh_signing.rs | ||
test_view.rs | ||
test_workspace.rs |