Ilya Grigoriev 70b517ca64 conflicts.rs: label conflict number and sides next to conflict markers ... For example, ``` <<<<<<< Conflict 1 of 3 +++++++ Contents of side #1 left 3.1 left 3.2 left 3.3 %%%%%%% Changes from base to side #2 -line 3 +right 3.1 >>>>>>> ``` or ``` <<<<<<< Conflict 1 of 1 %%%%%%% Changes from base to side #1 -line 3 +right 3.1 +++++++ Contents of side #2 left 3.1 left 3.2 left 3.3 >>>>>>> ``` Currently, there is no way to disable these, this is TODO for a future PR. Other TODOs for future PRs: make these labels configurable. After that, we could support a `diff3/git`-like conflict format as well, in principle. Counting conflicts helps with knowing whether you fixed all the conflicts while you are in the editor. While labeling "side #1", etc, does not tell you the commit id or description as requested in #1176, I still think it's an improvement. Most importantly, I hope this will make `jj`'s conflict format less scary-looking for new users. I've used this for a bit, and I like it. Without the labels, I would see that the two conflicts have a different order of conflict markers, but I wouldn't be able to remember what that means. For longer diffs, it can be tricky for me to quickly tell that it's a diff as opposed to one of the sides. This also creates some hope of being able to navigate a conflict with more than 2 sides. Another not-so-secret goal for this is explained in https://github.com/martinvonz/jj/pull/3109#issuecomment-2014140627. The idea is a little weird, but I *think* it could be helpful, and I'd like to experiment with it.		2024-05-05 18:42:14 -07:00
..
common	rebase: rewrite rebase_revision to use transform_descendants	2024-04-22 21:05:49 +08:00
cli-reference@.md.snap	cli --ignore-immutable help: remove double negative	2024-05-03 15:50:17 -07:00
runner.rs	Implement advance-branches for jj commit	2024-04-20 10:26:04 -04:00
test_abandon_command.rs	tree: flatten TreeMergeError into BackendError	2024-03-30 22:40:05 +09:00
test_advance_branches.rs	Implement advance-branches for jj new	2024-04-20 10:26:04 -04:00
test_alias.rs	cli: add "Hint: " or "Warning: " heading to almost all messages	2024-03-26 11:23:13 +09:00
test_branch_command.rs	cli: unblock "branch list --all-remotes" with name patterns	2024-04-03 08:59:29 +09:00
test_builtin_aliases.rs	cli: show timestamp in local timezone and without millis and offset	2024-03-20 07:54:08 -07:00
test_cat_command.rs	conflicts.rs: label conflict number and sides next to conflict markers	2024-05-05 18:42:14 -07:00
test_checkout.rs	cli: add convenient methods to print hint or warning with default headings	2024-03-26 00:28:27 +09:00
test_chmod_command.rs	conflicts.rs: label conflict number and sides next to conflict markers	2024-05-05 18:42:14 -07:00
test_commit_command.rs	cli: add "Hint: " or "Warning: " heading to almost all messages	2024-03-26 11:23:13 +09:00
test_commit_template.rs	cli: show hint for inner fileset/revset/template errors	2024-05-05 11:16:17 +09:00
test_concurrent_operations.rs	op_store: add metadata flag for ops representing working-copy snapshot	2024-02-19 22:44:38 -08:00
test_config_command.rs	cli: add "Hint: " or "Warning: " heading to almost all messages	2024-03-26 11:23:13 +09:00
test_debug_command.rs	merged_tree: propagate errors from TreeEntriesIterator	2024-05-01 06:10:08 -07:00
test_describe_command.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_diff_command.rs	tests: avoid a use of deprecated jj move	2024-04-28 11:12:51 -07:00
test_diffedit_command.rs	conflicts.rs: label conflict number and sides next to conflict markers	2024-05-05 18:42:14 -07:00
test_duplicate_command.rs	rebase: do not modify commit IDs if commit is unchanged after rebase	2024-03-29 15:22:50 +08:00
test_edit_command.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_generate_md_cli_help.rs	docs, CLI reference: use include-markdown instead of a symlink	2024-02-12 10:28:09 -08:00
test_git_clone.rs	cli: rename --all to --all-remotes for branch list	2024-04-01 10:12:13 +09:00
test_git_colocated.rs	cli: rename --all to --all-remotes for branch list	2024-04-01 10:12:13 +09:00
test_git_fetch.rs	cli: rename --all to --all-remotes for branch list	2024-04-01 10:12:13 +09:00
test_git_import_export.rs	cli: rename --all to --all-remotes for branch list	2024-04-01 10:12:13 +09:00
test_git_init.rs	cli: rename --all to --all-remotes for branch list	2024-04-01 10:12:13 +09:00
test_git_push.rs	git_backend: add a README to conflicted commits	2024-04-22 06:22:54 -07:00
test_git_remotes.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_git_submodule.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_gitignores.rs	cli: add "Hint: " or "Warning: " heading to almost all messages	2024-03-26 11:23:13 +09:00
test_global_opts.rs	cli --ignore-immutable help: remove double negative	2024-05-03 15:50:17 -07:00
test_immutable_commits.rs	squash: add test that immutable commits are respected for --from/--into	2024-04-28 13:06:37 -07:00
test_init_command.rs	cli: rename --all to --all-remotes for branch list	2024-04-01 10:12:13 +09:00
test_interdiff_command.rs	conflicts.rs: label conflict number and sides next to conflict markers	2024-05-05 18:42:14 -07:00
test_log_command.rs	templates: reimplement builtin_change_id_with_hidden_and_divergent_info alias	2024-04-26 16:56:35 +09:00
test_move_command.rs	squash: don't rewrite commits that didn't change	2024-04-30 20:03:57 -07:00
test_new_command.rs	cli: don't check duplicates in revisions prefixed with "all:"	2024-04-02 15:17:12 +09:00
test_next_prev_commands.rs	Make jj next work when the working copy is a merge commit	2024-04-08 14:52:11 -04:00
test_obslog_command.rs	conflicts.rs: label conflict number and sides next to conflict markers	2024-05-05 18:42:14 -07:00
test_operations.rs	templates: reimplement builtin_change_id_with_hidden_and_divergent_info alias	2024-04-26 16:56:35 +09:00
test_parallelize_command.rs	parallelize: make the command pass in more cases	2024-04-18 21:06:52 -07:00
test_rebase_command.rs	rebase: do not print out commit summaries of skipped commits	2024-05-01 01:35:25 +08:00
test_repo_change_report.rs	rebase: add move_commits function to perform rebasing	2024-04-29 14:19:09 +08:00
test_resolve_command.rs	conflicts.rs: label conflict number and sides next to conflict markers	2024-05-05 18:42:14 -07:00
test_restore_command.rs	conflicts.rs: label conflict number and sides next to conflict markers	2024-05-05 18:42:14 -07:00
test_revset_output.rs	revset: add support for file(kind:pattern) syntax	2024-04-07 19:43:29 +09:00
test_root.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_shell_completion.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_show_command.rs	templates: reimplement builtin_change_id_with_hidden_and_divergent_info alias	2024-04-26 16:56:35 +09:00
test_sparse_command.rs	sparse: extract "set --reset" to subcommand	2024-03-29 11:02:31 +09:00
test_split_command.rs	Rewrite rebasing in jj split using transform_descendants()	2024-04-21 12:21:39 -04:00
test_squash_command.rs	conflicts.rs: label conflict number and sides next to conflict markers	2024-05-05 18:42:14 -07:00
test_status_command.rs	cli: status: when current change has conflicts, display instructions to resolve them	2024-05-01 15:59:12 +02:00
test_tag_command.rs	cli: show commit summary in "tag list"	2024-05-03 15:16:52 +09:00
test_templater.rs	templates: reimplement builtin_change_id_with_hidden_and_divergent_info alias	2024-04-26 16:56:35 +09:00
test_tree_level_conflicts.rs	git_backend: add a README to conflicted commits	2024-04-22 06:22:54 -07:00
test_undo.rs	cli: rename --all to --all-remotes for branch list	2024-04-01 10:12:13 +09:00
test_unsquash_command.rs	description_utils: teach combine_messages() to handle more than two sources	2024-03-13 05:21:05 -07:00
test_untrack_command.rs	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
test_util_command.rs	op_store: add metadata flag for ops representing working-copy snapshot	2024-02-19 22:44:38 -08:00
test_working_copy.rs	cli: add another test for snapshot.max-new-file-size	2024-04-19 13:03:24 -05:00
test_workspaces.rs	git_backend: add a README to conflicted commits	2024-04-22 06:22:54 -07:00