aboutsummaryrefslogtreecommitdiffstats
path: root/docs/api.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api.md')
-rw-r--r--docs/api.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/api.md b/docs/api.md
index a839f74..05abf44 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -192,7 +192,8 @@ one of another kind (a map written over a list), it is written anew.
`?conflicts=true` on a read answers `{"value": …, "conflicts": [...]}`: every place on
the way where concurrent values were resolved, with all candidates and which was
-selected (`mergedMaps` or `newestWins`). A later write at that path ends the conflict.
+selected (`mergedMaps`, `newestWins`, or `highestSeq` for a signed value where the policy
+asks for them). A later write at that path ends the conflict.
## Following changes