7 commits

Author	SHA1	Message	Date
Yuya Nishihara	7a3e72415c	cli: send status messages to stderr, specify stdout/stderr explicitly ... Many of &mut UI can be changed to immutable borrows, but I'm not gonna update them in this patch.	2023-10-11 19:24:01 +09:00
Yuya Nishihara	58acc1d111	tests: replace jj_cmd_success() involving mutation to allow stderr output	2023-10-11 19:24:01 +09:00
Martin von Zweigbergk	2ccb17b7b3	cli: enable tree-level conflicts by default ... I have used the tree-level conflict format for several weeks without problem (after the fix in 51b5d168ae). Now - right after the 0.10.0 release - seems like a good time to enable the config by default. I enabled the config in our default configs in the CLI crate to reduce impact on tests (compared to changing the default in `settings.rs`).	2023-10-05 10:31:47 -07:00
Waleed Khan	393b035498	merge_tools: create builtin merge editor	2023-09-18 06:33:29 +02:00
Yuya Nishihara	e3c85d6ecc	revset: convert root symbol to function ... The idea is that we can fully eliminate special symbols that would otherwise shadow user branches, tags, or change ID prefixes. Closes #2095	2023-09-04 10:36:30 +09:00
Ilya Grigoriev	6fa8a25839	cli templates: include branches in short commit description ... They are shown next to the change and commit id, since they are other names the commit can be referred by. The description is separated from the branches by a ` | ` when there are branches, so that one can tell the branches from the description without color. The result looks like this: 	2023-08-10 20:58:40 -07:00
Martin von Zweigbergk	0075174308	tests: move tests/ under cli/ so they're run again ... Thanks to @ilyagr for noticing that they should be moved.	2023-08-05 06:18:59 +00:00

Renamed from tests/test_resolve_command.rs (Browse further)