diff options
Diffstat (limited to 'cache/repo_cache_common.go')
| -rw-r--r-- | cache/repo_cache_common.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cache/repo_cache_common.go b/cache/repo_cache_common.go index 66797e80..43ac6beb 100644 --- a/cache/repo_cache_common.go +++ b/cache/repo_cache_common.go @@ -6,9 +6,9 @@ import ( "github.com/go-git/go-billy/v5" "github.com/pkg/errors" - "github.com/MichaelMure/git-bug/bug" + "github.com/MichaelMure/git-bug/entities/bug" + "github.com/MichaelMure/git-bug/entities/identity" "github.com/MichaelMure/git-bug/entity" - "github.com/MichaelMure/git-bug/identity" "github.com/MichaelMure/git-bug/repository" ) @@ -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 |