aboutsummaryrefslogtreecommitdiffstats
path: root/entity
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2022-03-22 21:28:10 +0100
committerMichael Muré <batolettre@gmail.com>2022-03-22 21:28:10 +0100
commitc9cec5b17bde94d7e3fd40c71a32d16a936769fa (patch)
treefd3ba4481aa6d5782d88cf1faf6451560fd5e059 /entity
parentcac20c8c4dc9524773c1296165fe596cb9035202 (diff)
downloadgit-bug-c9cec5b17bde94d7e3fd40c71a32d16a936769fa.tar.gz
update doc
Diffstat (limited to 'entity')
-rw-r--r--entity/dag/entity.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/entity/dag/entity.go b/entity/dag/entity.go
index 0760cdec..f3229b7e 100644
--- a/entity/dag/entity.go
+++ b/entity/dag/entity.go
@@ -205,7 +205,7 @@ func read(def Definition, repo repository.ClockedRepo, resolver identity.Resolve
if oppSlice[i].EditTime != oppSlice[j].EditTime {
return oppSlice[i].EditTime < oppSlice[j].EditTime
}
- // We have equal EditTime, which means we have concurrent edition over different machines and we
+ // We have equal EditTime, which means we have concurrent edition over different machines, and we
// can't tell which one came first. So, what now? We still need a total ordering and the most stable possible.
// As a secondary ordering, we can order based on a hash of the serialized Operations in the
// operationPack. It doesn't carry much meaning but it's unbiased and hard to abuse.