Yuya Nishihara f1898a31b5 merge: simply print interleaved conflict values in debug output ...

We could apply that for the resolved case, but Resolved/Conflicted label
seems more useful than just printing Merge([value]).

2023-11-06 07:21:06 +09:00

..

common

tests: disable parsing of system CA certificates in CLI tests

2023-10-08 02:41:20 +09:00

test_abandon_command.rs

cli templates: include hidden (AKA abandoned) status in short commit template

2023-10-24 12:37:26 -07:00

test_alias.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

test_branch_command.rs

cli: add "branch list [NAMES]..." filter

2023-11-01 08:38:55 -07:00

test_builtin_aliases.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

test_cat_command.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

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

merge: simply print interleaved conflict values in debug output

2023-11-06 07:21:06 +09:00

test_commit_command.rs

clippy: run cargo clippy --fix --workspace with recent nightly

2023-10-29 20:19:44 -07: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

merge_tools: do not follow or change permission of symlinks

2023-11-06 07:20:52 +09:00

test_diffedit_command.rs

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

test_duplicate_command.rs

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

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

git: preserve HEAD when possible

2023-11-01 08:23:52 -03:00

test_git_fetch.rs

cli templates: include hidden (AKA abandoned) status in short commit template

2023-10-24 12:37:26 -07:00

test_git_import_export.rs

cli templates: include hidden (AKA abandoned) status in short commit template

2023-10-24 12:37:26 -07:00

test_git_push.rs

cli: add string pattern support to "git push --branch"

2023-10-26 04:51:17 +09:00

test_git_remotes.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

test_git_submodule.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

test_gitignores.rs

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

test_global_opts.rs

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

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

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

test_interdiff_command.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

test_log_command.rs

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

test_move_command.rs

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

test_new_command.rs

immutable commits: remove the hint if trying to edit the root commit

2023-10-29 21:13:39 -07:00

test_next_prev_commands.rs

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

test_obslog_command.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

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: Allow jj rebase -r to rebase a commit onto a descendant

2023-10-30 10:56:27 -07:00

test_resolve_command.rs

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

test_restore_command.rs

cli: rebase descendants earlier for jj diffedit and jj restore

2023-10-26 17:58:13 -07:00

test_revset_output.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

test_show_command.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

test_sparse_command.rs

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

test_split_command.rs

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

test_squash_command.rs

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

test_status_command.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

test_templater.rs

tests: migrate most tests from test_templater.rs

2023-10-27 05:30:53 +09:00

test_tree_level_conflicts.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

test_undo.rs

cli change id templates: make "hidden" override "divergent"

2023-10-26 17:58:13 -07:00

test_unsquash_command.rs

cli: send status messages to stderr, specify stdout/stderr explicitly

2023-10-11 19:24:01 +09:00

test_untrack_command.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

test_util_command.rs

tests: move tests/ under cli/ so they're run again

2023-08-05 06:18:59 +00:00

test_working_copy.rs

tests: replace jj_cmd_success() involving mutation to allow stderr output

2023-10-11 19:24:01 +09:00

test_workspaces.rs

merge: simply generate content hash from interleaved values

2023-11-06 07:21:06 +09:00