ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/cli
Yuya Nishihara 73a8b13e4c conflicts: split materialized value to FileConflict and OtherConflict
FileConflict will be changed to not materialize Merge<BString>. I also updated
the revset engine to ignore non-file conflict. It doesn't make sense to grep
conflict description.
2024-08-28 10:23:57 +09:00
..
examples cleanup: remove redundant ::{self} from use declarations 2024-08-23 13:05:27 +09:00
src conflicts: split materialized value to FileConflict and OtherConflict 2024-08-28 10:23:57 +09:00
testing formatting only: switch to Item level import ganularity 2024-08-22 14:52:54 -04:00
tests cli: move "untrack" to "file" subcommand 2024-08-26 01:19:15 +09: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 built-in pager: write a message to the user if pager failed to start 2024-08-03 17:45:18 -07:00
LICENSE cargo: add LICENSE file to each crate we publish 2023-09-22 21:48:28 -07:00