Martin von Zweigbergk 2dae5f58dd cli: print a message about new and resolved conflicts ... When e.g. `jj rebase` results in new conflicts, it's useful for the user to learn about that without having to run `jj log` right after. This patch adds reporting of new conflicts created by an operation. It also add reporting of conflicts that were resolved or abandoned by the operation. There was no measurable performance impact when rebasing a single commit in the Linux kernel repo.		2023-12-10 12:44:57 -08:00
..
common	cli rebase -r: add tests for weird ancestry, record a bug, fix a comment	2023-11-28 21:36:51 -08:00
test_abandon_command.rs	test_abandon_command: create another test for bug 2600	2023-12-01 17:03:44 -08:00
test_alias.rs
test_branch_command.rs	cli: print failed git export reason for each ref	2023-12-09 23:37:00 +09:00
test_builtin_aliases.rs
test_cat_command.rs
test_checkout.rs
test_chmod_command.rs	cli: print a message about new and resolved conflicts	2023-12-10 12:44:57 -08:00
test_commit_command.rs	clippy: fix new issues spotted by nightly version	2023-11-16 10:20:07 -08:00
test_commit_template.rs
test_concurrent_operations.rs
test_config_command.rs
test_debug_command.rs
test_describe_command.rs
test_diff_command.rs	clippy: fix new issues spotted by nightly version	2023-11-16 10:20:07 -08:00
test_diffedit_command.rs
test_duplicate_command.rs
test_edit_command.rs
test_git_clone.rs
test_git_colocated.rs	cli: print failed git export reason for each ref	2023-12-09 23:37:00 +09:00
test_git_fetch.rs
test_git_import_export.rs	cli: print failed git export reason for each ref	2023-12-09 23:37:00 +09:00
test_git_push.rs
test_git_remotes.rs
test_git_submodule.rs
test_gitignores.rs
test_global_opts.rs
test_immutable_commits.rs
test_init_command.rs	workspace: consider .git symlink when generating relative git_target path	2023-12-05 14:23:59 -08:00
test_interdiff_command.rs
test_log_command.rs
test_move_command.rs
test_new_command.rs	cli new: have --no-edit print description of the new commit	2023-11-23 11:15:38 -08:00
test_next_prev_commands.rs
test_obslog_command.rs
test_operations.rs
test_rebase_command.rs	cli rebase: tests for weird ancestry for -s and -b	2023-11-28 21:36:51 -08:00
test_repo_change_report.rs	cli: print a message about new and resolved conflicts	2023-12-10 12:44:57 -08:00
test_resolve_command.rs	cli: print a message about new and resolved conflicts	2023-12-10 12:44:57 -08:00
test_restore_command.rs	cli: print a message about new and resolved conflicts	2023-12-10 12:44:57 -08: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
test_tree_level_conflicts.rs
test_undo.rs
test_unsquash_command.rs
test_untrack_command.rs
test_util_command.rs
test_working_copy.rs
test_workspaces.rs