diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-22 22:25:18 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-22 22:29:01 +1100 |
| commit | 1034962c7edad578427d056b7421c9195c29a457 (patch) | |
| tree | c901a2309df784d3cdbe4d337c8b03acf61e20d2 /pkg/integration/tests/tests_gen.go | |
| parent | eabe7f462a1f950d05b66306c19a00855e3fa175 (diff) | |
migrate more tests
Diffstat (limited to 'pkg/integration/tests/tests_gen.go')
| -rw-r--r-- | pkg/integration/tests/tests_gen.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 635451b54..c99870d43 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -121,6 +121,12 @@ var tests = []*components.IntegrationTest{ sync.ForcePushMultipleUpstream, sync.Pull, sync.PullAndSetUpstream, + sync.PullMerge, + sync.PullMergeConflict, + sync.PullRebase, + sync.PullRebaseConflict, + sync.PullRebaseInteractiveConflict, + sync.PullRebaseInteractiveConflictDrop, sync.Push, sync.PushAndAutoSetUpstream, sync.PushAndSetUpstream, |