Yuya Nishihara
30666dfbcf
cli: preserve source of user error, print source chain one by one
...
"Caused by" lines are inserted before the hint because they are more strongly
related to the error.
2024-02-02 08:22:24 +09:00
Ilya Grigoriev
bef2ecadac
cli: change R to D for "deleted" in diff summary
...
@joyously ponted out that `R` could be interpreted as "renamed" instead of
"removed". "Deleted" is unambiguous.
2024-01-26 10:01:40 -08:00
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
2023-10-05 10:31:47 -07:00
Ilya Grigoriev
038867fd3f
merge_tools: Allow 3-pane diff editing
...
As discussed in https://github.com/martinvonz/jj/discussions/1905#discussioncomment-6589673
2023-08-21 20:19:15 -07:00
Ilya Grigoriev
fdf1a56178
test_diffedit_command: Show that diffedit ignores unknown files
...
To me, this behavior seems a bit unexpected. We may want to fix it later
2023-08-21 19:02:19 -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
