Martin von Zweigbergk a88b3dd2f5 cli: print a hint about how to resolve conflicts ... This prints a hint about using `jj new <first conflicted commit>` and `jj squash` to resolve conflicts. The hint is printed whenever there are new or resolved conflicts. I hope this hint will be useful especially for new users so they know which commit to resolve conflicts in first. It may not be obvious that they should start with the bottommost one. I hope the hint will also be useful for more more experienced user by letting them just copy the printed command without first running `jj log` to find the right commit..		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	cli templates: include info on divergent change ids in short commit template	2023-10-26 17:58:13 -07:00
test_chmod_command.rs	cli: print a hint about how to resolve 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	templater: add local/remote_branches keywords	2023-10-28 11:03:23 +09:00
test_concurrent_operations.rs	merge: simply generate content hash from interleaved values	2023-11-06 07:21:06 +09:00
test_config_command.rs	cli: allow overwriting non-scalar with jj config set	2023-10-11 07:40:08 -07:00
test_debug_command.rs	merge: simply generate content hash from interleaved values	2023-11-06 07:21:06 +09:00
test_describe_command.rs	clippy: run cargo clippy --fix --workspace with recent nightly	2023-10-29 20:19:44 -07:00
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	git_backend: replace git2::Repository with gix::Repository	2023-11-02 19:33:06 +09:00
test_git_clone.rs	cli: add "branch list --all" option to include all remote branches	2023-10-19 05:23:38 +09:00
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	tests: don't create new branch by "jj branch set"	2023-11-11 07:03:31 +09:00
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	tests: don't create new branch by "jj branch set"	2023-11-11 07:03:31 +09:00
test_git_remotes.rs	tests: don't create new branch by "jj branch set"	2023-11-11 07:03:31 +09:00
test_git_submodule.rs
test_gitignores.rs
test_global_opts.rs
test_immutable_commits.rs	immutable commits: remove the hint if trying to edit the root commit	2023-10-29 21:13:39 -07:00
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	tests: don't create new branch by "jj branch set"	2023-11-11 07:03:31 +09:00
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	tests: don't create new branch by "jj branch set"	2023-11-11 07:03:31 +09:00
test_obslog_command.rs
test_operations.rs	merge: simply generate content hash from interleaved values	2023-11-06 07:21:06 +09:00
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 hint about how to resolve conflicts	2023-12-10 12:44:57 -08:00
test_resolve_command.rs	cli: print a hint about how to resolve conflicts	2023-12-10 12:44:57 -08:00
test_restore_command.rs	cli: print a hint about how to resolve 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	tests: migrate most tests from test_templater.rs	2023-10-27 05:30:53 +09:00
test_tree_level_conflicts.rs
test_undo.rs	cli change id templates: make "hidden" override "divergent"	2023-10-26 17:58:13 -07:00
test_unsquash_command.rs
test_untrack_command.rs
test_util_command.rs
test_working_copy.rs
test_workspaces.rs	merge: simply generate content hash from interleaved values	2023-11-06 07:21:06 +09:00