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 65c5fd71b..ac7faff31 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts_test.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts_test.go @@ -1320,7 +1320,7 @@ func testResolveConflicts(t *testing.T, ctx context.Context) { skipCommitCheck: true, additionalChecks: func() { objectsAfter := len(strings.Split(text.ChompBytes(gittest.Exec(t, cfg, "-C", repoPath, "rev-list", "--objects", "--all")), "\n")) - require.Equal(t, objectsBefore, objectsAfter, "No new objets should've been added") + require.Equal(t, objectsBefore, objectsAfter, "No new objects should've been added") }, } }, |