jj/tests
Ilya Grigoriev 9a3329ee25 jj resolve --list: make output aligned
If all file names are short enough, this will align the conflict
description at 4 spaces past the longest file name, as follows.

```
src/templater.rs            2-sided conflict
src/templater_parsers.rs    2-sided conflict
```

If there is a long file name, conflict descriptions will either start
or column 35 or one space from a file name, whichever is later.

Previously, a single tab was used to separate file name from conflict
description. This didn't look as nice as I hoped when multiple files
are involved. I also don't think `jj` generally uses tabs in output.
The tab uncovered a bug in a watcher program I was using.
2023-01-11 23:29:53 -08:00
..
common Add a config edit command to open jj config in editor 2023-01-12 01:10:07 -06:00
test_alias.rs cli: parse early args in/after alias properly 2022-12-14 13:51:23 +09:00
test_branch_command.rs feat(branch): support jj branch forget --glob 2022-12-10 16:51:10 -08:00
test_checkout.rs cli: append "\n" to commit description specified by -m/--message 2022-12-22 14:59:03 +09:00
test_commit_command.rs cli: include diff summary in commit/describe editor content 2022-12-23 00:47:22 +09:00
test_commit_template.rs cli: fix highlighting of checkout commit in "log --no-graph" 2023-01-11 11:33:28 +09:00
test_concurrent_operations.rs cli: append "\n" to commit description specified by -m/--message 2022-12-22 14:59:03 +09:00
test_config_command.rs Add a config edit command to open jj config in editor 2023-01-12 01:10:07 -06:00
test_debug_command.rs Add "jj debug config-schema" command to output JSON schema 2023-01-03 22:02:25 -06:00
test_describe_command.rs tests: use insta to test editor contents 2022-12-23 00:47:22 +09:00
test_diff_command.rs cli: allow multiple diff outputs 2022-12-15 11:41:42 +09:00
test_diffedit_command.rs cli: append "\n" to commit description specified by -m/--message 2022-12-22 14:59:03 +09:00
test_edit_command.rs cli: append "\n" to commit description specified by -m/--message 2022-12-22 14:59:03 +09:00
test_git_clone.rs cli: on clone, turn local git remote to absolute path 2022-12-07 14:14:31 +09:00
test_git_colocated.rs cli: append "\n" to commit description specified by -m/--message 2022-12-22 14:59:03 +09:00
test_git_export.rs cli: hint about how to recover from failed export of branches 2022-11-28 19:54:31 -08:00
test_git_push.rs Shorten the git push branch when possible using the short change ID hash. 2023-01-12 11:45:13 +05:30
test_git_remotes.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
test_gitignores.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
test_global_opts.rs cli: do not search ancestor paths specified by -R/--repository 2023-01-10 23:31:26 +09:00
test_init_command.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
test_interdiff_command.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
test_log_command.rs Move a test from test_log_command to test_commit_template 2023-01-09 22:44:45 -08:00
test_move_command.rs tests: use insta to test editor contents 2022-12-23 00:47:22 +09:00
test_new_command.rs cli: append "\n" to commit description specified by -m/--message 2022-12-22 14:59:03 +09:00
test_obslog_command.rs cli: normalize line ending of edited commit description, ensure last newline 2022-12-22 14:59:03 +09:00
test_operations.rs jj op log: Show durations with relative timestamps 2023-01-07 12:08:00 -08:00
test_print_command.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
test_rebase_command.rs cli: append "\n" to commit description specified by -m/--message 2022-12-22 14:59:03 +09:00
test_resolve_command.rs jj resolve --list: make output aligned 2023-01-11 23:29:53 -08:00
test_restore_command.rs cmd: Remove the -i option to jj restore. 2022-12-21 08:15:06 -08:00
test_revset_output.rs revset: parse hg/git-like '^' postfix operator and show hint 2022-12-23 00:38:29 +09:00
test_show_command.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
test_sparse_command.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
test_split_command.rs cli: rephrase diff summary header so it can be reused for commit/describe 2022-12-23 00:47:22 +09:00
test_squash_command.rs tests: use insta to test editor contents 2022-12-23 00:47:22 +09:00
test_status_command.rs cli: append "\n" to commit description specified by -m/--message 2022-12-22 14:59:03 +09:00
test_templater.rs jj log: Change conflicted branches from br? to br?? 2023-01-09 22:44:45 -08:00
test_undo.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
test_unsquash_command.rs jj log: Change conflicted branches from br? to br?? 2023-01-09 22:44:45 -08:00
test_untrack_command.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
test_workspaces.rs cli: append "\n" to commit description specified by -m/--message 2022-12-22 14:59:03 +09:00