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 8843eee35c resolve: add --select option to interactively choose a side 
This should be more intuitive than the `:ours` and `:theirs` merge
tools since it can display the exact labels of all of the terms. It also
merges hunks before selecting the term, which should make it more
consistent with what's shown in conflicted files.
2025-12-22 17:30:39 -06:00
..
examples clippy: enable unnecessary_literal_bound lint 2025-12-05 17:07:44 +00:00
src resolve: add --select option to interactively choose a side 2025-12-22 17:30:39 -06:00
testing bisect: add missing closing backtick, make tests pass on Windows 2025-12-19 04:18:46 +00:00
tests resolve: add --select option to interactively choose a side 2025-12-22 17:30:39 -06: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