mirrors/jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2025-12-23 06:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
jj/cli
History
Exact
Scott Taylor 34a1f86862 merge: include conflict labels when describing non-file conflicts 
This should make it easier to resolve these conflicts using
`jj restore --from <commit>`.
2025-12-23 04:11:09 +00:00
..
examples clippy: enable unnecessary_literal_bound lint 2025-12-05 17:07:44 +00:00
src merge: include conflict labels when describing non-file conflicts 2025-12-23 04:11:09 +00:00
testing bisect: add missing closing backtick, make tests pass on Windows 2025-12-19 04:18:46 +00:00
tests merge: include conflict labels when describing non-file conflicts 2025-12-23 04:11:09 +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
LICENSE