Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/gitaly/service/operations/merge_to_ref_test.go')
-rw-r--r--internal/gitaly/service/operations/merge_to_ref_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/gitaly/service/operations/merge_to_ref_test.go b/internal/gitaly/service/operations/merge_to_ref_test.go
index 28863e136..3781ffd71 100644
--- a/internal/gitaly/service/operations/merge_to_ref_test.go
+++ b/internal/gitaly/service/operations/merge_to_ref_test.go
@@ -218,7 +218,7 @@ func testUserMergeToRefConflicts(t *testing.T, ctx context.Context) {
require.False(t, hasRevision, "branch should not have been created")
})
- t.Run("target reference is ambigous", func(t *testing.T) {
+ t.Run("target reference is ambiguous", func(t *testing.T) {
gittest.WriteRef(t, cfg, repoPath, "refs/merge-requests/x/written-before", right)
request := &gitalypb.UserMergeToRefRequest{