Martin von Zweigbergk 21b11df8a9 merge: make non-conflicted debug string for Merge shorter ... Resolves states are most common and the current format is pretty verbose. Let's print it as if `Merge` were an enum with `Resolved` and `Conflicted` variants instead.		2023-10-24 06:45:45 -07:00
..
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_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_view.rs
test_workspace.rs