forked from mirrors/jj
8e47d2d66f
We're finally ready to start writing trees using the new format where we represent conflicts by having multiple trees in the commit instead of having a single tree with multiple entries at a path. This patch adds a config option for that. It's not ready to be used yet, so I haven't updated the release notes or other documentation. I added only a simple CLI test for testing what happens when the config is enabled in an existing repo. 108 tests currently fail if we flip the default. |
||
---|---|---|
.. | ||
common | ||
test_abandon_command.rs | ||
test_alias.rs | ||
test_branch_command.rs | ||
test_cat_command.rs | ||
test_checkout.rs | ||
test_chmod_command.rs | ||
test_commit_command.rs | ||
test_commit_template.rs | ||
test_concurrent_operations.rs | ||
test_config_command.rs | ||
test_debug_command.rs | ||
test_describe_command.rs | ||
test_diff_command.rs | ||
test_diffedit_command.rs | ||
test_duplicate_command.rs | ||
test_edit_command.rs | ||
test_git_clone.rs | ||
test_git_colocated.rs | ||
test_git_fetch.rs | ||
test_git_import_export.rs | ||
test_git_push.rs | ||
test_git_remotes.rs | ||
test_git_submodule.rs | ||
test_gitignores.rs | ||
test_global_opts.rs | ||
test_init_command.rs | ||
test_interdiff_command.rs | ||
test_log_command.rs | ||
test_move_command.rs | ||
test_new_command.rs | ||
test_obslog_command.rs | ||
test_operations.rs | ||
test_rebase_command.rs | ||
test_resolve_command.rs | ||
test_restore_command.rs | ||
test_revset_output.rs | ||
test_show_command.rs | ||
test_sparse_command.rs | ||
test_split_command.rs | ||
test_squash_command.rs | ||
test_status_command.rs | ||
test_templater.rs | ||
test_tree_level_conflicts.rs | ||
test_undo.rs | ||
test_unsquash_command.rs | ||
test_untrack_command.rs | ||
test_util_command.rs | ||
test_workspaces.rs |