Martin von Zweigbergk 2ccb17b7b3 cli: enable tree-level conflicts by default ... I have used the tree-level conflict format for several weeks without problem (after the fix in 51b5d168ae). Now - right after the 0.10.0 release - seems like a good time to enable the config by default. I enabled the config in our default configs in the CLI crate to reduce impact on tests (compared to changing the default in `settings.rs`).		2023-10-05 10:31:47 -07:00
..
common
test_abandon_command.rs	cli: make set of immutable commits configurable	2023-09-25 15:41:45 -07:00
test_alias.rs
test_branch_command.rs	cli: redefine default log revset using immutable_heads()	2023-10-01 11:15:30 -07:00
test_builtin_aliases.rs
test_cat_command.rs
test_checkout.rs	cli: hint for same change ids	2023-09-21 22:53:46 -03:00
test_chmod_command.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
test_commit_command.rs	commands: support path arguments to jj commit	2023-09-30 21:45:06 -05:00
test_commit_template.rs	cli: ensure first new HEAD is detached	2023-10-03 00:58:22 +09:00
test_concurrent_operations.rs
test_config_command.rs
test_debug_command.rs
test_describe_command.rs
test_diff_command.rs
test_diffedit_command.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
test_duplicate_command.rs	cli: jj duplicate should refuse to duplicate only the root commit	2023-09-25 15:41:45 -07:00
test_edit_command.rs	cli: make set of immutable commits configurable	2023-09-25 15:41:45 -07:00
test_git_clone.rs
test_git_colocated.rs	git: add hack to unset Git HEAD by using placeholder ref	2023-10-05 01:32:48 +09:00
test_git_fetch.rs	cli: don't list commits abandoned by import/fetch, just print the number	2023-10-03 14:07:56 +09:00
test_git_import_export.rs
test_git_push.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
test_git_remotes.rs
test_git_submodule.rs	cli: ensure first new HEAD is detached	2023-10-03 00:58:22 +09:00
test_gitignores.rs
test_global_opts.rs	release: release version 0.10.0	2023-10-04 16:45:45 -07:00
test_immutable_commits.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
test_init_command.rs	cli: add context to checkout/abandon messages triggered by automated git import	2023-10-02 17:31:05 +09:00
test_interdiff_command.rs
test_log_command.rs	cli: report error on bad short-prefixes revset	2023-10-01 11:15:30 -07:00
test_move_command.rs
test_new_command.rs
test_next_prev_commands.rs
test_obslog_command.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
test_operations.rs
test_rebase_command.rs
test_resolve_command.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
test_restore_command.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
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	cli: redefine default log revset using immutable_heads()	2023-10-01 11:15:30 -07:00
test_tree_level_conflicts.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
test_undo.rs	cli: make set of immutable commits configurable	2023-09-25 15:41:45 -07:00
test_unsquash_command.rs
test_untrack_command.rs
test_util_command.rs
test_working_copy.rs
test_workspaces.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00