diff options
| author | Michael Muré <batolettre@gmail.com> | 2022-08-18 16:03:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-18 16:03:48 +0200 |
| commit | 6664a251f1893e6ddc183aa6061d6f0fd4f40a57 (patch) | |
| tree | e42bcfc39ccf9284f645dde7ae5990c6d4995ade /cache/repo_cache_common.go | |
| parent | ec24de3f0d19ff1a56d0b12d389ec1535be43ea2 (diff) | |
| parent | 45f5f852b71a63c142bca8b05efe53eebf142594 (diff) | |
| download | git-bug-6664a251f1893e6ddc183aa6061d6f0fd4f40a57.tar.gz | |
Merge pull request #844 from MichaelMure/resolvers
WIP resolvers
Diffstat (limited to 'cache/repo_cache_common.go')
| -rw-r--r-- | cache/repo_cache_common.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cache/repo_cache_common.go b/cache/repo_cache_common.go index 66797e80..49ec72d0 100644 --- a/cache/repo_cache_common.go +++ b/cache/repo_cache_common.go @@ -118,7 +118,7 @@ func (c *RepoCache) MergeAll(remote string) <-chan entity.MergeResult { } } - results = bug.MergeAll(c.repo, remote, author) + results = bug.MergeAll(c.repo, c.resolvers, remote, author) for result := range results { out <- result |