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
..
design
technical	op log: change "resolve concurrent" to "reconcile divergent"	2024-08-30 21:56:11 -07:00
branches.md	op log: change "resolve concurrent" to "reconcile divergent"	2024-08-30 21:56:11 -07:00
cli-reference.md
code-of-conduct.md
community_tools.md
config.md
config.toml
conflicts.md
contributing.md
design_doc_blueprint.md
design_docs.md
FAQ.md
filesets.md
git-comparison.md
git-compatibility.md
github.md
glossary.md
index.md
install-and-setup.md
operation-log.md	op log: change "resolve concurrent" to "reconcile divergent"	2024-08-30 21:56:11 -07:00
related-work.md
revsets.md
sapling-comparison.md
templates.md
testimonials.md
tutorial.md
windows.md
working-copy.md