diff options
Diffstat (limited to 'internal/gitaly/service/conflicts/resolve_conflicts_test.go')
-rw-r--r-- | internal/gitaly/service/conflicts/resolve_conflicts_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/gitaly/service/conflicts/resolve_conflicts_test.go b/internal/gitaly/service/conflicts/resolve_conflicts_test.go index 7ba39d3e0..611670b6a 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts_test.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts_test.go @@ -692,7 +692,7 @@ func TestFailedResolveConflictsRequestDueToValidation(t *testing.T) { SourceBranch: sourceBranch, TargetBranch: targetBranch, }, - expectedErr: status.Error(codes.InvalidArgument, testhelper.GitalyOrPraefectMessage( + expectedErr: status.Error(codes.InvalidArgument, testhelper.GitalyOrPraefect( "ResolveConflicts: empty Repository", "repo scoped: empty Repository", )), |