ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/cli
Martin von Zweigbergk cc15ecf7c7 op log: change "resolve concurrent" to "reconcile divergent"
"Concurrent" operations are not necessarily actually concurrent, so
"divergent" seems like a better name. And "reconcile" seems like a
better term for merging them, though we also sometimes use "merge".
2024-08-30 21:56:11 -07:00
..
examples cleanup: remove redundant ::{self} from use declarations 2024-08-23 13:05:27 +09:00
src op log: change "resolve concurrent" to "reconcile divergent" 2024-08-30 21:56:11 -07:00
testing formatting only: switch to Item level import ganularity 2024-08-22 14:52:54 -04:00
tests op log: change "resolve concurrent" to "reconcile divergent" 2024-08-30 21:56:11 -07: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