Martin von Zweigbergk 8e47d2d66f merged_tree: add config option to write trees using new format ... 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.		2023-08-30 06:17:21 -07:00
..
common	cli tests: Move current_operation_id to test_utils	2023-08-22 17:39:56 -07:00
test_abandon_command.rs
test_alias.rs	cli: hide irrelevant information about root commit in default log templates	2023-08-15 18:54:59 +03:00
test_branch_command.rs	index: import commits in chronological order	2023-08-15 15:03:45 +09:00
test_cat_command.rs
test_checkout.rs
test_chmod_command.rs	cli: say that jj chmod errors out if there are any non-file sides	2023-08-14 18:15:34 -07:00
test_commit_command.rs	cli: add support for setting default description	2023-08-13 23:59:15 +05:30
test_commit_template.rs	templates: default placeholders to red	2023-08-30 12:54:15 +08:00
test_concurrent_operations.rs
test_config_command.rs	cleanup: fix warnings from nightly clippy	2023-08-14 22:11:56 -07:00
test_debug_command.rs
test_describe_command.rs	cli: add support for setting default description	2023-08-13 23:59:15 +05:30
test_diff_command.rs	Add jj diffs --stat option	2023-08-19 23:49:16 -07:00
test_diffedit_command.rs	merge_tools: Allow 3-pane diff editing	2023-08-21 20:19:15 -07:00
test_duplicate_command.rs	cleanup: fix warnings from nightly clippy	2023-08-14 22:11:56 -07:00
test_edit_command.rs
test_git_clone.rs	cleanup: fix warnings from nightly clippy	2023-08-14 22:11:56 -07:00
test_git_colocated.rs	cleanup: fix warnings from nightly clippy	2023-08-14 22:11:56 -07:00
test_git_fetch.rs	git: do not import refs from remote named "git"	2023-08-29 22:50:46 +09:00
test_git_import_export.rs	cli tests: Move current_operation_id to test_utils	2023-08-22 17:39:56 -07:00
test_git_push.rs	cli: make jj git push default to -r 'remote_branches()..@'	2023-08-23 15:00:03 -07:00
test_git_remotes.rs	git: prohibit creation of remote named "git"	2023-08-29 22:50:46 +09:00
test_git_submodule.rs
test_gitignores.rs
test_global_opts.rs	Enable wrapping help in clap	2023-08-22 22:24:03 -07:00
test_init_command.rs	cli: hide irrelevant information about root commit in default log templates	2023-08-15 18:54:59 +03:00
test_interdiff_command.rs	diff_util: use MergedTree throughout	2023-08-27 07:50:28 -07:00
test_log_command.rs	templater: make .short(negative_len) return 0-length string	2023-08-25 22:59:20 +09:00
test_move_command.rs
test_new_command.rs
test_obslog_command.rs	diff_util: use MergedTree throughout	2023-08-27 07:50:28 -07:00
test_operations.rs	templater: make .short(negative_len) return 0-length string	2023-08-25 22:59:20 +09:00
test_rebase_command.rs
test_resolve_command.rs
test_restore_command.rs
test_revset_output.rs	revset: add literal:"string" pattern syntax	2023-08-17 07:42:12 +09:00
test_show_command.rs
test_sparse_command.rs
test_split_command.rs	cli: when splitting change without description, skip it on second part	2023-08-15 10:12:12 -07:00
test_squash_command.rs
test_status_command.rs	Fix .gitignore handling of ignored directories	2023-08-22 22:08:32 -07:00
test_templater.rs	templater: move empty signature placeholder to user template	2023-08-27 09:38:36 +09:00
test_tree_level_conflicts.rs	merged_tree: add config option to write trees using new format	2023-08-30 06:17:21 -07:00
test_undo.rs	cli tests: Move current_operation_id to test_utils	2023-08-22 17:39:56 -07:00
test_unsquash_command.rs
test_untrack_command.rs
test_util_command.rs
test_workspaces.rs	revset: resolve "@" symbol's workspace id earlier (while parsing)	2023-08-20 17:57:18 -07:00