aboutsummaryrefslogtreecommitdiffstats
path: root/entity/dag/entity_actions.go
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2022-03-10 16:37:45 +0100
committerGitHub <noreply@github.com>2022-03-10 16:37:45 +0100
commitbf9c7e00d022d0a0210dd5e2b8c3e7d38de64099 (patch)
tree956495036e383caab11006239e31e591436a33cd /entity/dag/entity_actions.go
parentdf55cc49a85eaf3a2d3c2ceb1fbcccac19fa6eb8 (diff)
parentb11679bc80b115c61a5cdee8ff8b5f8f1f69533d (diff)
downloadgit-bug-bf9c7e00d022d0a0210dd5e2b8c3e7d38de64099.tar.gz
Merge pull request #762 from MichaelMure/fix-comment
Fix a bunch of comments and documentations
Diffstat (limited to 'entity/dag/entity_actions.go')
-rw-r--r--entity/dag/entity_actions.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/entity/dag/entity_actions.go b/entity/dag/entity_actions.go
index 2926e992..5b6e884d 100644
--- a/entity/dag/entity_actions.go
+++ b/entity/dag/entity_actions.go
@@ -89,7 +89,7 @@ func MergeAll(def Definition, repo repository.ClockedRepo, resolver identity.Res
return out
}
-// merge perform a merge to make sure a local Entity is up to date.
+// merge perform a merge to make sure a local Entity is up-to-date.
// See MergeAll for more details.
func merge(def Definition, repo repository.ClockedRepo, resolver identity.Resolver, remoteRef string, author identity.Interface) entity.MergeResult {
id := entity.RefToId(remoteRef)