Philip Metzger de022aeaa7 next/prev: Implement next/prev --conflict ...

This allows users to jump to the next conflict in the ancestors or children of 
the start commit.

Continues work on #2126

Co-Authored-By: Noah Mayr <dev@noahmayr.com>

2024-06-20 23:29:41 +02:00

..

common

rebase: rewrite rebase_revision to use transform_descendants

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

cli-reference@.md.snap

next/prev: Implement next/prev --conflict

2024-06-20 23:29:41 +02:00

runner.rs

feat: Create a file command containing print and chmod

2024-06-17 12:17:49 -04:00

test_abandon_command.rs

repo: when abandoning a working copy that a merge, recreate it

2024-05-29 06:54:30 -07:00

test_acls.rs

feat: Create a file command containing print and chmod

2024-06-17 12:17:49 -04:00

test_advance_branches.rs

new: convert --insert-before and --insert-after into proper options

2024-06-05 19:29:27 +08:00

test_alias.rs

cli: create jj file list and deprecate jj files

2024-06-17 14:13:36 -04:00

test_branch_command.rs

cli: branch: reject empty branch name consistently by "set"

2024-06-20 17:00:34 +09:00

test_builtin_aliases.rs

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

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

test_checkout.rs

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

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

revset: omit function name from type error messages

2024-06-05 10:39:32 +09: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

Show paths of config files when configurations contain errors

2024-06-10 10:14:36 +00: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

cli: Add an option to diff to output only paths.

2024-06-19 20:27:51 -04:00

test_diffedit_command.rs

feat: Create a file command containing print and chmod

2024-06-17 12:17:49 -04: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_file_chmod_command.rs

feat: Create a file command containing print and chmod

2024-06-17 12:17:49 -04:00

test_file_print_command.rs

feat: Create a file command containing print and chmod

2024-06-17 12:17:49 -04:00

test_fix_command.rs

feat: Create a file command containing print and chmod

2024-06-17 12:17:49 -04:00

test_generate_md_cli_help.rs

test_generate_cli_reference: fixup to 52c415e, remove mysterious comment

2024-06-15 20:30:40 -07: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: don't abandon non-discardable old wc commit by import_git_head()

2024-05-25 10:29:30 +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

cargo: upgrade gix to version 0.63

2024-05-22 11:20:57 -07:00

test_git_init.rs

git: unset unborn HEAD ref on export

2024-06-01 11:01:16 +09:00

test_git_push.rs

cli: let jj git push --change handle large revsets

2024-06-20 11:40:55 -05: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

feat: Create a file command containing print and chmod

2024-06-17 12:17:49 -04:00

test_immutable_commits.rs

feat: Create a file command containing print and chmod

2024-06-17 12:17:49 -04: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

feat: Create a file command containing print and chmod

2024-06-17 12:17:49 -04:00

test_new_command.rs

feat: Create a file command containing print and chmod

2024-06-17 12:17:49 -04:00

test_next_prev_commands.rs

next/prev: Implement next/prev --conflict

2024-06-20 23:29:41 +02:00

test_obslog_command.rs

conflicts: label closing delimeter with conflict number

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

test_operations.rs

cli: rename "debug workingcopy" to "debug working-copy"

2024-06-20 09:55:18 +09: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

merge_tools: simplify file conflicts before attempting to resolve

2024-06-15 06:05:06 +08:00

test_restore_command.rs

conflicts: label closing delimeter with conflict number

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

test_revset_output.rs

revset, templater: include parameter names in AliasId

2024-06-14 23:11: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

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

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

test_sparse_command.rs

cli: create jj file list and deprecate jj files

2024-06-17 14:13:36 -04:00

test_split_command.rs

cli: deprecate jj split --siblings in favor of jj split --parallel

2024-06-15 22:45:34 +09:00

test_squash_command.rs

feat: Create a file command containing print and chmod

2024-06-17 12:17:49 -04:00

test_status_command.rs

print_conflicted_paths: simplify file conflicts before printing

2024-06-15 06:05:06 +08: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

revset, templater: include parameter names in AliasId

2024-06-14 23:11:29 +09:00

test_undo.rs

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

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

test_unsquash_command.rs

feat: Create a file command containing print and chmod

2024-06-17 12:17:49 -04:00

test_untrack_command.rs

cli: create jj file list and deprecate jj files

2024-06-17 14:13:36 -04:00

test_util_command.rs

cli: implement enough of jj fix to run a single tool on all files

2024-06-04 14:28:21 -05:00

test_working_copy.rs

cli: create jj file list and deprecate jj files

2024-06-17 14:13:36 -04:00

test_workspaces.rs

revset: clarify error about missing working-copy commit for workspace

2024-06-20 16:21:58 +09:00