Martin von Zweigbergk 513d50de92 cli: if bookmark list includes conflicts, hint how to resolve them ...

When `jj status` reports conflicted bookmarks, it suggests running `jj
bookmark list` for details and `jj bookmark set` to resolve the
conflict. However, it's easy to just read the first half of the hint
and run `jj bookmark list` and then not know what to do. Let's remind
the user of the hint in the `jj bookmark list` output if there are
conflicted bookmarks. It should also be useful for users who run `jj
bookmark list` out of habit (not directly because `jj status`
suggested it).

2025-11-07 14:42:45 +00:00

..

examples

working_copy: make potentially slow methods async

2025-10-15 03:27:06 +00:00

src

cli: if bookmark list includes conflicts, hint how to resolve them

2025-11-07 14:42:45 +00:00

testing

tests: exercise more bisect behaviors

2025-11-01 23:17:31 +00:00

tests

cli: if bookmark list includes conflicts, hint how to resolve them

2025-11-07 14:42:45 +00:00

build.rs

colocation: rename from "colocated repo" to "colocated workspace"

2025-11-03 16:53:26 +00:00

Cargo.toml

ui: switch to std::io::pipe()

2025-09-19 09:41:32 +00:00

docs

build: fix cargo publish by symlinking cli/docs->docs

2024-11-05 17:37:14 -08:00

LICENSE

cargo: add LICENSE file to each crate we publish

2023-09-22 21:48:28 -07:00