Ilya Grigoriev 1f7c4ec60a conflicts: label closing delimeter with conflict number ...

This follows up on https://github.com/martinvonz/jj/pull/3459 and adds a
label to the closing delimeter of each conflict, e.g.  "Conflict 1 of 3
ends".

I didn't initially put any label at the ending delimeter since the
starting delimeter is already marked with "Conflict 1 of 3". However,
I'm now realizing that when I resolve conflicts, I usually go from top
to bottom. The first thing I do is delete the starting conflict
delimeter. It is when I get to the *end* of the conflict that I wonder
whether there are any more conflicts left in the file.

2024-05-20 18:36:51 -07:00

..

common

rebase: rewrite rebase_revision to use transform_descendants

2024-04-22 21:05:49 +08:00

cli-reference@.md.snap

cli: add ui.color = "debug"

2024-05-11 10:16:09 +02:00

runner.rs

Implement advance-branches for jj commit

2024-04-20 10:26:04 -04:00

test_abandon_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_advance_branches.rs

Implement advance-branches for jj new

2024-04-20 10:26:04 -04:00

test_alias.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_branch_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_builtin_aliases.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_cat_command.rs

conflicts: label closing delimeter with conflict number

2024-05-20 18:36:51 -07:00

test_checkout.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_chmod_command.rs

conflicts: label closing delimeter with conflict number

2024-05-20 18:36:51 -07:00

test_commit_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_commit_template.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_concurrent_operations.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_config_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_debug_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_describe_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_diff_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_diffedit_command.rs

conflicts: label closing delimeter with conflict number

2024-05-20 18:36:51 -07:00

test_duplicate_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_edit_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07: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

tests: use get_branch_output() helper thoroughly in test_git_*

2024-05-19 22:45:32 +09:00

test_git_fetch.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_git_import_export.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07: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

tests: use get_branch_output() helper thoroughly in test_git_*

2024-05-19 22:45:32 +09:00

test_git_remotes.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_git_submodule.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_gitignores.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_global_opts.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_immutable_commits.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -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: label closing delimeter with conflict number

2024-05-20 18:36:51 -07:00

test_log_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_move_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_new_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_next_prev_commands.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_obslog_command.rs

conflicts: label closing delimeter with conflict number

2024-05-20 18:36:51 -07:00

test_operations.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_parallelize_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_rebase_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_repo_change_report.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_resolve_command.rs

conflicts: label closing delimeter with conflict number

2024-05-20 18:36:51 -07:00

test_restore_command.rs

conflicts: label closing delimeter with conflict number

2024-05-20 18:36:51 -07:00

test_revset_output.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07: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

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_sparse_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_split_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_squash_command.rs

conflicts: label closing delimeter with conflict number

2024-05-20 18:36:51 -07:00

test_status_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_tag_command.rs

templater: add helper method that unwraps Option<T> property

2024-05-09 08:51:34 +09:00

test_templater.rs

templater: attach alias traces to function parameter

2024-05-18 09:53:52 +09:00

test_tree_level_conflicts.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_undo.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_unsquash_command.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -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

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_workspaces.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00