mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-30 03:23:08 +03:00
migrate merge conflict tests
This commit is contained in:
Jesse Duffield
38
pkg/integration/tests/conflicts/filter.go
Normal file
38
pkg/integration/tests/conflicts/filter.go
Normal file
@ -0,0 +1,38 @@
|
||||
package conflicts
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/lazygit/pkg/config"
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
|
||||
)
|
||||
|
||||
var Filter = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Ensures that when there are merge conflicts, the files panel only shows conflicted files",
|
||||
ExtraCmdArgs: "",
|
||||
Skip: false,
|
||||
SetupConfig: func(config *config.AppConfig) {},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shared.CreateMergeConflictFiles(shell)
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
t.Views().Files().
|
||||
IsFocused().
|
||||
Lines(
|
||||
Contains("UU").Contains("file1").IsSelected(),
|
||||
Contains("UU").Contains("file2"),
|
||||
).
|
||||
Press(keys.Files.OpenStatusFilter).
|
||||
Tap(func() {
|
||||
t.ExpectPopup().Menu().
|
||||
Title(Equals("Filtering")).
|
||||
Select(Contains("Reset filter")).
|
||||
Confirm()
|
||||
}).
|
||||
Lines(
|
||||
Contains("UU").Contains("file1").IsSelected(),
|
||||
Contains("UU").Contains("file2"),
|
||||
// now we see the non-merge conflict file
|
||||
Contains("A ").Contains("file3"),
|
||||
)
|
||||
},
|
||||
})
|
||||
33
pkg/integration/tests/conflicts/resolve_externally.go
Normal file
33
pkg/integration/tests/conflicts/resolve_externally.go
Normal file
@ -0,0 +1,33 @@
|
||||
package conflicts
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/lazygit/pkg/config"
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
|
||||
)
|
||||
|
||||
var ResolveExternally = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Ensures that when merge conflicts are resolved outside of lazygit, lazygit prompts you to continue",
|
||||
ExtraCmdArgs: "",
|
||||
Skip: false,
|
||||
SetupConfig: func(config *config.AppConfig) {},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shared.CreateMergeConflictFile(shell)
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
t.Views().Files().
|
||||
IsFocused().
|
||||
Lines(
|
||||
Contains("UU file").IsSelected(),
|
||||
).
|
||||
Tap(func() {
|
||||
t.Shell().UpdateFile("file", "resolved content")
|
||||
}).
|
||||
Press(keys.Universal.Refresh)
|
||||
|
||||
t.Actions().ContinueOnConflictsResolved()
|
||||
|
||||
t.Views().Files().
|
||||
IsEmpty()
|
||||
},
|
||||
})
|
||||
54
pkg/integration/tests/conflicts/resolve_multiple_files.go
Normal file
54
pkg/integration/tests/conflicts/resolve_multiple_files.go
Normal file
@ -0,0 +1,54 @@
|
||||
package conflicts
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/lazygit/pkg/config"
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
|
||||
)
|
||||
|
||||
var ResolveMultipleFiles = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Ensures that upon resolving conflicts for one file, the next file is selected",
|
||||
ExtraCmdArgs: "",
|
||||
Skip: false,
|
||||
SetupConfig: func(config *config.AppConfig) {},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shared.CreateMergeConflictFiles(shell)
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
t.Views().Files().
|
||||
IsFocused().
|
||||
Lines(
|
||||
Contains("UU").Contains("file1").IsSelected(),
|
||||
Contains("UU").Contains("file2"),
|
||||
).
|
||||
PressEnter()
|
||||
|
||||
t.Views().MergeConflicts().
|
||||
IsFocused().
|
||||
SelectedLines(
|
||||
Contains("<<<<<<< HEAD"),
|
||||
Contains("First Change"),
|
||||
Contains("======="),
|
||||
).
|
||||
PressPrimaryAction()
|
||||
|
||||
t.Views().Files().
|
||||
IsFocused().
|
||||
Lines(
|
||||
Contains("UU").Contains("file2").IsSelected(),
|
||||
).
|
||||
PressEnter()
|
||||
|
||||
// coincidentally these files have the same conflict
|
||||
t.Views().MergeConflicts().
|
||||
IsFocused().
|
||||
SelectedLines(
|
||||
Contains("<<<<<<< HEAD"),
|
||||
Contains("First Change"),
|
||||
Contains("======="),
|
||||
).
|
||||
PressPrimaryAction()
|
||||
|
||||
t.Actions().ContinueOnConflictsResolved()
|
||||
},
|
||||
})
|
||||
@ -60,6 +60,33 @@ var CreateMergeCommit = func(shell *Shell) {
|
||||
shell.ContinueMerge()
|
||||
}
|
||||
|
||||
// creates a merge conflict where there are two files with conflicts and a separate file without conflicts
|
||||
var CreateMergeConflictFiles = func(shell *Shell) {
|
||||
shell.
|
||||
NewBranch("original-branch").
|
||||
EmptyCommit("one").
|
||||
EmptyCommit("two").
|
||||
EmptyCommit("three").
|
||||
CreateFileAndAdd("file1", OriginalFileContent).
|
||||
CreateFileAndAdd("file2", OriginalFileContent).
|
||||
Commit("original").
|
||||
NewBranch("first-change-branch").
|
||||
UpdateFileAndAdd("file1", FirstChangeFileContent).
|
||||
UpdateFileAndAdd("file2", FirstChangeFileContent).
|
||||
Commit("first change").
|
||||
Checkout("original-branch").
|
||||
NewBranch("second-change-branch").
|
||||
UpdateFileAndAdd("file1", SecondChangeFileContent).
|
||||
UpdateFileAndAdd("file2", SecondChangeFileContent).
|
||||
// this file is not changed in the second branch
|
||||
CreateFileAndAdd("file3", "content").
|
||||
Commit("second change").
|
||||
EmptyCommit("second-change-branch unrelated change").
|
||||
Checkout("first-change-branch")
|
||||
|
||||
shell.RunShellCommandExpectError("git merge --no-edit second-change-branch")
|
||||
}
|
||||
|
||||
// These 'multiple' variants are just like the short ones but with longer file contents and with multiple conflicts within the file.
|
||||
|
||||
var OriginalFileContentMultiple = `
|
||||
@ -110,8 +137,7 @@ Other
|
||||
Other Second Change
|
||||
`
|
||||
|
||||
// prepares us for a rebase/merge that has conflicts
|
||||
var MergeConflictsSetupMultiple = func(shell *Shell) {
|
||||
var CreateMergeConflictFileMultiple = func(shell *Shell) {
|
||||
shell.
|
||||
NewBranch("original-branch").
|
||||
EmptyCommit("one").
|
||||
@ -128,16 +154,6 @@ var MergeConflictsSetupMultiple = func(shell *Shell) {
|
||||
Commit("second change").
|
||||
EmptyCommit("second-change-branch unrelated change").
|
||||
Checkout("first-change-branch")
|
||||
}
|
||||
|
||||
var CreateMergeConflictFileMultiple = func(shell *Shell) {
|
||||
MergeConflictsSetupMultiple(shell)
|
||||
|
||||
shell.RunShellCommandExpectError("git merge --no-edit second-change-branch")
|
||||
}
|
||||
|
||||
var CreateMergeCommitMultiple = func(shell *Shell) {
|
||||
CreateMergeConflictFileMultiple(shell)
|
||||
shell.UpdateFileAndAdd("file", SecondChangeFileContentMultiple)
|
||||
shell.ContinueMerge()
|
||||
}
|
||||
|
||||
@ -59,6 +59,9 @@ var tests = []*components.IntegrationTest{
|
||||
commit.StagedWithoutHooks,
|
||||
commit.Unstaged,
|
||||
config.RemoteNamedStar,
|
||||
conflicts.Filter,
|
||||
conflicts.ResolveExternally,
|
||||
conflicts.ResolveMultipleFiles,
|
||||
conflicts.UndoChooseHunk,
|
||||
custom_commands.Basic,
|
||||
custom_commands.FormPrompts,
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
disableStartupPopups: true
|
||||
gui:
|
||||
showFileTree: false
|
||||
refresher:
|
||||
refreshInterval: 1
|
||||
@ -1,36 +0,0 @@
|
||||
Merge branch 'develop' into other_branch
|
||||
|
||||
# Conflicts:
|
||||
# directory/file
|
||||
# directory/file2
|
||||
# file1
|
||||
# file3
|
||||
# file4
|
||||
# file5
|
||||
#
|
||||
# It looks like you may be committing a merge.
|
||||
# If this is not correct, please remove the file
|
||||
# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/mergeConflicts/actual/.git/MERGE_HEAD
|
||||
# and try again.
|
||||
|
||||
|
||||
# Please enter the commit message for your changes. Lines starting
|
||||
# with '#' will be ignored, and an empty message aborts the commit.
|
||||
#
|
||||
# On branch other_branch
|
||||
# All conflicts fixed but you are still merging.
|
||||
#
|
||||
# Changes to be committed:
|
||||
# new file: cherrypicking1
|
||||
# new file: cherrypicking2
|
||||
# new file: cherrypicking3
|
||||
# new file: cherrypicking4
|
||||
# new file: cherrypicking5
|
||||
# new file: cherrypicking6
|
||||
# new file: cherrypicking7
|
||||
# new file: cherrypicking8
|
||||
# new file: cherrypicking9
|
||||
# modified: file1
|
||||
# modified: file4
|
||||
# modified: file5
|
||||
#
|
||||
@ -1 +0,0 @@
|
||||
ref: refs/heads/other_branch
|
||||
@ -1 +0,0 @@
|
||||
562af0640203fb5a6e92c090d8d1ded26806d2c4
|
||||
@ -1,10 +0,0 @@
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = false
|
||||
logallrefupdates = true
|
||||
ignorecase = true
|
||||
precomposeunicode = true
|
||||
[user]
|
||||
email = CI@example.com
|
||||
name = CI
|
||||
@ -1 +0,0 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
||||
Binary file not shown.
@ -1,7 +0,0 @@
|
||||
# git ls-files --others --exclude-from=.git/info/exclude
|
||||
# Lines that start with '#' are comments.
|
||||
# For a project mostly in C, the following would be a good set of
|
||||
# exclude patterns (uncomment them if you want to use them):
|
||||
# *.[oa]
|
||||
# *~
|
||||
.DS_Store
|
||||
@ -1,34 +0,0 @@
|
||||
0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000 commit (initial): first commit
|
||||
1618ce1085acb41fd710e279ac38911aadfb0a09 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000 checkout: moving from master to feature/cherry-picking
|
||||
1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI <CI@example.com> 1617671441 +1000 commit: first commit freshman year
|
||||
b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI <CI@example.com> 1617671441 +1000 commit: second commit subway eat fresh
|
||||
f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI <CI@example.com> 1617671441 +1000 commit: third commit fresh
|
||||
edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI <CI@example.com> 1617671441 +1000 commit: fourth commit cool
|
||||
cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI <CI@example.com> 1617671441 +1000 commit: fifth commit nice
|
||||
b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI <CI@example.com> 1617671441 +1000 commit: sixth commit haha
|
||||
df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI <CI@example.com> 1617671441 +1000 commit: seventh commit yeah
|
||||
1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000 commit: eighth commit woo
|
||||
d3e2708327280097b5e1f8ab69309934b24f8b64 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000 checkout: moving from feature/cherry-picking to develop
|
||||
d3e2708327280097b5e1f8ab69309934b24f8b64 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI <CI@example.com> 1617671441 +1000 commit: first commit on develop
|
||||
a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000 checkout: moving from develop to master
|
||||
1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI <CI@example.com> 1617671441 +1000 commit: first commit on master
|
||||
f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI <CI@example.com> 1617671441 +1000 checkout: moving from master to develop
|
||||
a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI <CI@example.com> 1617671441 +1000 commit: second commit on develop
|
||||
55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI <CI@example.com> 1617671441 +1000 checkout: moving from develop to master
|
||||
f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI <CI@example.com> 1617671441 +1000 commit: second commit on master
|
||||
a19ec0b99e516795f349033f09383f87be0b74e9 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI <CI@example.com> 1617671441 +1000 checkout: moving from master to develop
|
||||
55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 dd259e90c3748e269bdf1ee3ce537a006d2394aa CI <CI@example.com> 1617671441 +1000 commit: third commit on develop
|
||||
dd259e90c3748e269bdf1ee3ce537a006d2394aa a19ec0b99e516795f349033f09383f87be0b74e9 CI <CI@example.com> 1617671441 +1000 checkout: moving from develop to master
|
||||
a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI <CI@example.com> 1617671441 +1000 commit: third commit on master
|
||||
61db24350a92fa37b2fe35f13eb3dd3f7655f6cf dd259e90c3748e269bdf1ee3ce537a006d2394aa CI <CI@example.com> 1617671441 +1000 checkout: moving from master to develop
|
||||
dd259e90c3748e269bdf1ee3ce537a006d2394aa e563585cb87cc39b553ca421902d631ea8890118 CI <CI@example.com> 1617671441 +1000 commit: fourth commit on develop
|
||||
e563585cb87cc39b553ca421902d631ea8890118 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI <CI@example.com> 1617671441 +1000 checkout: moving from develop to master
|
||||
61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000 commit: fourth commit on master
|
||||
559043765dc6c32c943b6278b4abbff1e6f52839 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000 checkout: moving from master to base_branch
|
||||
559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000 commit: file
|
||||
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000 checkout: moving from base_branch to other_branch
|
||||
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000 checkout: moving from other_branch to base_branch
|
||||
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI <CI@example.com> 1617671441 +1000 commit: file changed
|
||||
341cf8213827614a274c750cd7dec4307eb41de7 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000 checkout: moving from base_branch to other_branch
|
||||
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI <CI@example.com> 1617671444 +1000 commit: asd
|
||||
562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI <CI@example.com> 1617671461 +1000 commit (merge): Merge branch 'develop' into other_branch
|
||||
@ -1,3 +0,0 @@
|
||||
0000000000000000000000000000000000000000 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000 branch: Created from HEAD
|
||||
559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000 commit: file
|
||||
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI <CI@example.com> 1617671441 +1000 commit: file changed
|
||||
@ -1,5 +0,0 @@
|
||||
0000000000000000000000000000000000000000 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000 branch: Created from HEAD
|
||||
d3e2708327280097b5e1f8ab69309934b24f8b64 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI <CI@example.com> 1617671441 +1000 commit: first commit on develop
|
||||
a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI <CI@example.com> 1617671441 +1000 commit: second commit on develop
|
||||
55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 dd259e90c3748e269bdf1ee3ce537a006d2394aa CI <CI@example.com> 1617671441 +1000 commit: third commit on develop
|
||||
dd259e90c3748e269bdf1ee3ce537a006d2394aa e563585cb87cc39b553ca421902d631ea8890118 CI <CI@example.com> 1617671441 +1000 commit: fourth commit on develop
|
||||
@ -1,9 +0,0 @@
|
||||
0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000 branch: Created from HEAD
|
||||
1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI <CI@example.com> 1617671441 +1000 commit: first commit freshman year
|
||||
b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI <CI@example.com> 1617671441 +1000 commit: second commit subway eat fresh
|
||||
f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI <CI@example.com> 1617671441 +1000 commit: third commit fresh
|
||||
edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI <CI@example.com> 1617671441 +1000 commit: fourth commit cool
|
||||
cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI <CI@example.com> 1617671441 +1000 commit: fifth commit nice
|
||||
b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI <CI@example.com> 1617671441 +1000 commit: sixth commit haha
|
||||
df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI <CI@example.com> 1617671441 +1000 commit: seventh commit yeah
|
||||
1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000 commit: eighth commit woo
|
||||
@ -1,5 +0,0 @@
|
||||
0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000 commit (initial): first commit
|
||||
1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI <CI@example.com> 1617671441 +1000 commit: first commit on master
|
||||
f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI <CI@example.com> 1617671441 +1000 commit: second commit on master
|
||||
a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI <CI@example.com> 1617671441 +1000 commit: third commit on master
|
||||
61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000 commit: fourth commit on master
|
||||
@ -1,3 +0,0 @@
|
||||
0000000000000000000000000000000000000000 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000 branch: Created from HEAD
|
||||
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI <CI@example.com> 1617671444 +1000 commit: asd
|
||||
562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI <CI@example.com> 1617671461 +1000 commit (merge): Merge branch 'develop' into other_branch
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,4 +0,0 @@
|
||||
x<01><>M
|
||||
<EFBFBD>0F]<5D><14>d&͏<11><> c<><63>P<EFBFBD><50>R<EFBFBD><52><EFBFBD>
|
||||
x<01><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ű<EFBFBD><C5B0>*,<2C><><10>g<EFBFBD>><3E>Ӟ
|
||||
<EFBFBD>MGΌ<EFBFBD>X<EFBFBD><EFBFBD>;<3B><><EFBFBD><EFBFBD>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>A
|
||||
<EFBFBD>0E]<5D><14>A<17>Tz<>I34<33><34>)ɴ<><C9B4>M<EFBFBD>K<EFBFBD><4B><EFBFBD>0 |>o<>\<14><>a<EFBFBD><61>83<38>BQ<42>/h E<>ǜ<>}<7D><><EFBFBD>a<EFBFBD><61>AsjAw<41>ތ<EFBFBD><DE8C>1O<31>*B<><07><><EFBFBD>|V<04>'5<><35><EFBFBD>C/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Q&c<><63><EFBFBD>۬5<DBAC><35>x<EFBFBD><78><EFBFBD><EFBFBD><EFBFBD><EFBFBD>7<EFBFBD>0|<7C>
|
||||
Binary file not shown.
@ -1 +0,0 @@
|
||||
x<01><><EFBFBD> <09>0C<>v<EFBFBD>L<EFBFBD> <1F>\<5C>j<EFBFBD>VО<56>W<EFBFBD><57>= <1D><05><08><><EFBFBD><EFBFBD><EFBFBD>M<<3C>i<EFBFBD>f.<2E><><EFBFBD>PU<50>M<>HT<48><54>3T<33>`Q<><51><EFBFBD>9<EFBFBD>"<22>^<5E><>h<EFBFBD>d[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>i+B<><42>;<3B>~<7E>/ Y :/<2F><1B><P<>
|
||||
@ -1,3 +0,0 @@
|
||||
x<01><>M
|
||||
<EFBFBD>0F]<5D><14>$<24><><EFBFBD> "t<>cL<63>*Sb
|
||||
߂p<><70> <1E>K<EFBFBD><4B>G<EFBFBD><01><>7f06<05> <1E>e<EFBFBD><65><EFBFBD><EFBFBD>a <0C>4<EFBFBD><34>HQ8瘲ڨ<E798B2><DAA8><EFBFBD><EFBFBD> k<><6B>i2!<0E><> <1A>&g#<23>;'><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>u^<5E><><EFBFBD><EFBFBD>=<3D><>j<EFBFBD><6A>q|@kΨ<>V=<3D>:<3A>9WR<57><52>W<EFBFBD>iP_P<5F>}<7D><> m<>A<EFBFBD>
|
||||
@ -1,6 +0,0 @@
|
||||
x<01><>A
|
||||
<EFBFBD>0E]<5D><14>d&S<>
|
||||
"BW=F&3E<33>mJ<6D><4A><EFBFBD>
|
||||
x<01><><EFBFBD>>/<2F>eyT<79>D<EFBFBD><44><EFBFBD><EFBFBD><EFBFBD>L<EFBFBD>R4<52>`<60>2w<32>G1<47>Tz<54>>d<>Ĉ<EFBFBD>mi<6D><69>B"C<>"1<>0E<30>r<16><><EFBFBD><EFBFBD><EFBFBD>䅣 <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD>eo<>I<EFBFBD>6<EFBFBD>)<29><>
|
||||
(<28><><EFBFBD>#8"<22>F[T<>?<3F><>i<EFBFBD><69>
|
||||
?
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>M
|
||||
<EFBFBD>0<10>a<EFBFBD>9<EFBFBD><39><05>i&?"BW=F<>Nh<4E><68>R#x| ^<5E><><EFBFBD><EFBFBD><EFBFBD>7<EFBFBD><37>.
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>M
|
||||
<EFBFBD>0<10>]<5D><14>d<>i<EFBFBD>"BW=<3D>$<24><>`<60><>F<EFBFBD><46><06><><EFBFBD><EFBFBD><EFBFBD>>ދ<><DE8B>g<EFBFBD><67><EFBFBD><EFBFBD>v@ <1F><>h,و<>
|
||||
@ -1,4 +0,0 @@
|
||||
x<01><>K
|
||||
<EFBFBD>0@]<5D><14>d&<26>|
|
||||
"BW=F<>L<EFBFBD><4C>6<EFBFBD>F<EFBFBD><46><16><><EFBFBD><EFBFBD>{<7B>R]<5D><><EFBFBD>&<<3C>]4<><34>9x<39> <20>L)Jb<4A>F<<12><><EFBFBD>Ǚ<>6<EFBFBD><36>6<EFBFBD>F<EFBFBD><46>`<60><><01><><EFBFBD>
|
||||
<EFBFBD>0F<EFBFBD><19>:<3A>Qs ѱ_<>Qw<51><07><><EFBFBD>]><3E><><EFBFBD>rIu<49>9<><39>3<><33>Q <1D><>j<EFBFBD><6A><EFBFBD>ʴ?<1B>*<2A>+dy<64>\7<><05><>><3E>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
x<01><><EFBFBD>
|
||||
<EFBFBD>0E]<5D>+f/H&<26>}<7D><><EFBFBD>U?c2<63><32>cKA<>ފ?<3F><>r<EFBFBD><72><EFBFBD><EFBFBD><EFBFBD>\<5C>qu( U<><55>A<EFBFBD><41><EFBFBD><EFBFBD>c]<5D>PA<50>j<EFBFBD>C<EFBFBD>D<EFBFBD>֬<EFBFBD><D6AC>(<28>5<EFBFBD>
|
||||
<EFBFBD><EFBFBD>Y4x<EFBFBD>c<EFBFBD><16><>D<EFBFBD><44>cc<>b;#<23>2-<2D><><EFBFBD>.<2E>p<EFBFBD>K<EFBFBD>z<EFBFBD>I<EFBFBD>t<EFBFBD>6<EFBFBD><36>al<EF998E>5<EFBFBD><35><EFBFBD>*<2A>7q<37>[<5B><>E1c<31><63><<3C>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
x<01><>M
|
||||
<EFBFBD>0F]<5D><14>$<24><>I"BW=F2Nm<4E><6D>R"z| ^<5E><><EFBFBD>{<7B><>[<5B>K<07>ݡo"<10>%<25><><EFBFBD>̥<18><>Ll<4C><6C><14><><EFBFBD><EFBFBD>bd<62>Ԛ7yv<79><76><EFBFBD><EFBFBD><EFBFBD>
|
||||
"<22><><EFBFBD> <1E>>Y <1B><><EFBFBD>p<EFBFBD>9&<26>_}n #<23><><EFBFBD>*<2A>\ׇ<><D787><EFBFBD> a<><61><EFBFBD>! Qk<51><6B>u?<3F><>O\<5C>r<EFBFBD><72> ?
|
||||
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
x<01><><EFBFBD> <09>0C<><43><14><>?<3F>3<EFBFBD>Ƶ V<>=iO<69><4F>= <1D><05><08><><EFBFBD><EFBFBD><EFBFBD>,<01>8tW<><57>@h*<2A><>&R$j<08>*y<><79>ʑs-ܜ<><DC9C>8v)<29><>u㧱<75><E3A7B1>V<EFBFBD>H<EFBFBD><48><EFBFBD><EFBFBD><EFBFBD><17>"<0F><17>
|
||||
@ -1,3 +0,0 @@
|
||||
x<01><>K
|
||||
<EFBFBD>0@]<5D><14>d&<26>i@D<><44>cL<63> -XSJ<14><><EFBFBD><05>>ރWں. ,<2C><>敖B<EFAA90>X'a<>Rgb<67><62>=<3D>˾:L<>S1<53><31><EFBFBD><EFBFBD>B<>à1{<7B>,<2C><>Pk<50>jCf.$5Zks@g<><67><EFBFBD><EFBFBD><EFBFBD>x<EFBFBD><78>x<EFBFBD><78>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> P$<24>L<EFBFBD> ͗~<7E><><EFBFBD><EFBFBD><EFBFBD>>/<2F><04>
|
||||
<EFBFBD>&}<7D><>m<EFBFBD><03><>@;
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>M
|
||||
<EFBFBD> F<><46><14>/G<>?PJ!<21> C<> )<29>Ĕ <1E><>^<5E><><EFBFBD><EFBFBD>_<><5F><EFBFBD>:(<28>Ko<4B><6F>1<1A><13>&<26><18>O<EFBFBD>f<EFBFBD>ee<<3C><>J<EFBFBD><4A>5<EFBFBD>=6<>:<10>!p<>Y<EFBFBD><59>+<12>Ȭ3<0F>E)-) L<>" }<7D>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
x<01>ϻj1<10><><EFBFBD><EFBFBD>ӹ<08><><EFBFBD>4<EFBFBD> <20><>+y<><79><EFBFBD>l<EFBFBD><6C>]-B1~<7E>,<2C><>i<EFBFBD><69>5<EFBFBD><35>u<EFBFBD>`<60><>FW}&e#.<2E><19><><EFBFBD><12><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>YR<59><52><04><><EFBFBD>u<1B><>ӌb<D38C><62><EFBFBD><EFBFBD>%<25><>#<23>P<EFBFBD>j<EFBFBD><6A>J<EFBFBD>b<EFBFBD><62>:1.<2E><><EFBFBD>/<2F><><EFBFBD><EFBFBD>)<29>2E<32>*<2A>4<EFBFBD><10>(L<>{,<2C><><EFBFBD><02><>˻>Һ<><D2BA><EFBFBD><EFBFBD><EFBFBD>
|
||||
Binary file not shown.
@ -1 +0,0 @@
|
||||
341cf8213827614a274c750cd7dec4307eb41de7
|
||||
@ -1 +0,0 @@
|
||||
e563585cb87cc39b553ca421902d631ea8890118
|
||||
@ -1 +0,0 @@
|
||||
d3e2708327280097b5e1f8ab69309934b24f8b64
|
||||
@ -1 +0,0 @@
|
||||
559043765dc6c32c943b6278b4abbff1e6f52839
|
||||
@ -1 +0,0 @@
|
||||
f8dd12b796f400be7f59d9471670c3080f9c90a1
|
||||
@ -1 +0,0 @@
|
||||
this is file number 1 that I'm going to cherry-pick
|
||||
@ -1 +0,0 @@
|
||||
this is file number 2 that I'm going to cherry-pick
|
||||
@ -1 +0,0 @@
|
||||
this is file number 3 that I'm going to cherry-pick
|
||||
@ -1 +0,0 @@
|
||||
this is file number 4 that I'm going to cherry-pick
|
||||
@ -1 +0,0 @@
|
||||
this is file number 5 that I'm going to cherry-pick
|
||||
@ -1 +0,0 @@
|
||||
this is file number 6 that I'm going to cherry-pick
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user