ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/cli
Austin Seipp d3f9616c51 test_workspaces: fix merge skew from b7c7b19e + 220292ad
Summary: Yuya's changes and mine had a semantic conflict ("merge skew") between
the two of them, as b7c7b19e changed the `op log `output slightly, whereas
220292ad included a new test that used `op log` itself.

Generated by `cargo insta review`.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Change-Id: I51d4de7316b1abc09be4f9fa0dd0d1a1
2023-10-14 09:01:42 -05:00
..
examples cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
src workspace: convert external git repo path to store-relative by constructor 2023-10-14 22:20:09 +09:00
testing fake_diff_editor: Allow specifying extra arguments to be ignored 2023-08-21 20:19:15 -07:00
tests test_workspaces: fix merge skew from b7c7b19e + 220292ad 2023-10-14 09:01:42 -05:00
build.rs build: update rerun-if conditions to watch .git/HEAD in colocated repo 2023-08-06 12:16:11 +09:00
Cargo.toml backend: make read functions async 2023-10-08 23:36:49 -07:00
LICENSE cargo: add LICENSE file to each crate we publish 2023-09-22 21:48:28 -07:00