mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-02 09:21:40 +02:00
fix integration test
This commit is contained in:
Jesse Duffield
parent
c703cd8f88
commit
eb056576cf
@ -23,18 +23,16 @@ Merge branch 'develop' into other_branch
|
||||
# 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: directory/file
|
||||
# modified: directory/file2
|
||||
# modified: file1
|
||||
# modified: file3
|
||||
# modified: file4
|
||||
# modified: file5
|
||||
#
|
||||
# Untracked files:
|
||||
# cherrypicking6
|
||||
# cherrypicking3
|
||||
#
|
||||
|
||||
@ -1 +1 @@
|
||||
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab
|
||||
c62b5bc94e327ddb9b545213ff77b207ade48aba
|
||||
|
||||
Binary file not shown.
@ -1,33 +1,33 @@
|
||||
0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100 commit (initial): first commit
|
||||
416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100 checkout: moving from master to feature/cherry-picking
|
||||
416ca3083a0651e1c8be3ad7e0dbe8547a62be8a f47cc13dc21c72755ff2d96d0805837dbb028951 CI <CI@example.com> 1643188552 +1100 commit: first commit freshman year
|
||||
f47cc13dc21c72755ff2d96d0805837dbb028951 34850e31f804a946d014b14443cf7387546877b0 CI <CI@example.com> 1643188552 +1100 commit: second commit subway eat fresh
|
||||
34850e31f804a946d014b14443cf7387546877b0 66340a9343a65aec523bfc57bd5a870eb4e05959 CI <CI@example.com> 1643188552 +1100 commit: third commit fresh
|
||||
66340a9343a65aec523bfc57bd5a870eb4e05959 f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec CI <CI@example.com> 1643188552 +1100 commit: fourth commit cool
|
||||
f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec 4abe915d16bbc10f38b578390ff74c9ae62bf503 CI <CI@example.com> 1643188552 +1100 commit: fifth commit nice
|
||||
4abe915d16bbc10f38b578390ff74c9ae62bf503 93d727583328b5ce8f717380d014b87bd7893222 CI <CI@example.com> 1643188552 +1100 commit: sixth commit haha
|
||||
93d727583328b5ce8f717380d014b87bd7893222 951a2354eb5856644b0f1db74becc04c908beaa3 CI <CI@example.com> 1643188552 +1100 commit: seventh commit yeah
|
||||
951a2354eb5856644b0f1db74becc04c908beaa3 1fb30058516518ac1579a8df132b0e4dade8e51d CI <CI@example.com> 1643188552 +1100 commit: eighth commit woo
|
||||
1fb30058516518ac1579a8df132b0e4dade8e51d 1fb30058516518ac1579a8df132b0e4dade8e51d CI <CI@example.com> 1643188552 +1100 checkout: moving from feature/cherry-picking to develop
|
||||
1fb30058516518ac1579a8df132b0e4dade8e51d 40844e90419651d425c0845ec6f7c64ff63ebf03 CI <CI@example.com> 1643188552 +1100 commit: first commit on develop
|
||||
40844e90419651d425c0845ec6f7c64ff63ebf03 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100 checkout: moving from develop to master
|
||||
416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI <CI@example.com> 1643188552 +1100 commit: first commit on master
|
||||
165a3cfaf6a1d3d757fb7b1c509598a395108079 40844e90419651d425c0845ec6f7c64ff63ebf03 CI <CI@example.com> 1643188552 +1100 checkout: moving from master to develop
|
||||
40844e90419651d425c0845ec6f7c64ff63ebf03 9c59217622ae74189d18f2992121f97dd28e966b CI <CI@example.com> 1643188552 +1100 commit: second commit on develop
|
||||
9c59217622ae74189d18f2992121f97dd28e966b 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI <CI@example.com> 1643188552 +1100 checkout: moving from develop to master
|
||||
165a3cfaf6a1d3d757fb7b1c509598a395108079 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI <CI@example.com> 1643188552 +1100 commit: second commit on master
|
||||
454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f 9c59217622ae74189d18f2992121f97dd28e966b CI <CI@example.com> 1643188552 +1100 checkout: moving from master to develop
|
||||
9c59217622ae74189d18f2992121f97dd28e966b ba211bf3464f9c0429483a83963c1c69e1f53d4e CI <CI@example.com> 1643188552 +1100 commit: third commit on develop
|
||||
ba211bf3464f9c0429483a83963c1c69e1f53d4e 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI <CI@example.com> 1643188552 +1100 checkout: moving from develop to master
|
||||
454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f a83aac98467d005729bc9d80fe98abba47d41495 CI <CI@example.com> 1643188552 +1100 commit: third commit on master
|
||||
a83aac98467d005729bc9d80fe98abba47d41495 ba211bf3464f9c0429483a83963c1c69e1f53d4e CI <CI@example.com> 1643188552 +1100 checkout: moving from master to develop
|
||||
ba211bf3464f9c0429483a83963c1c69e1f53d4e 85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b CI <CI@example.com> 1643188552 +1100 commit: fourth commit on develop
|
||||
85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b a83aac98467d005729bc9d80fe98abba47d41495 CI <CI@example.com> 1643188552 +1100 checkout: moving from develop to master
|
||||
a83aac98467d005729bc9d80fe98abba47d41495 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI <CI@example.com> 1643188552 +1100 commit: fourth commit on master
|
||||
cd97d8e8ca03000f761f0e041cea0b6039923e70 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI <CI@example.com> 1643188552 +1100 checkout: moving from master to base_branch
|
||||
cd97d8e8ca03000f761f0e041cea0b6039923e70 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100 commit: file
|
||||
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100 checkout: moving from base_branch to other_branch
|
||||
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100 checkout: moving from other_branch to base_branch
|
||||
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 06d48b81c12e9c1a3cc2704c0db337639a8cdf85 CI <CI@example.com> 1643188552 +1100 commit: file changed
|
||||
06d48b81c12e9c1a3cc2704c0db337639a8cdf85 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100 checkout: moving from base_branch to other_branch
|
||||
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 4c1db169d59c4345aba213cb79934f4e38222f02 CI <CI@example.com> 1643188579 +1100 commit (merge): Merge branch 'develop' into other_branch
|
||||
0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI <CI@example.com> 1643618835 +1100 commit (initial): first commit
|
||||
f37ec566036d715d6995f55dbc82a4fb3cf56f2f f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI <CI@example.com> 1643618835 +1100 checkout: moving from master to feature/cherry-picking
|
||||
f37ec566036d715d6995f55dbc82a4fb3cf56f2f 21730e75ee0eec374cc54eb1140d24e03db834fc CI <CI@example.com> 1643618835 +1100 commit: first commit freshman year
|
||||
21730e75ee0eec374cc54eb1140d24e03db834fc 0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd CI <CI@example.com> 1643618835 +1100 commit: second commit subway eat fresh
|
||||
0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd 72c9bf1e687e81778850d517953c64f03adbaa1b CI <CI@example.com> 1643618835 +1100 commit: third commit fresh
|
||||
72c9bf1e687e81778850d517953c64f03adbaa1b 67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 CI <CI@example.com> 1643618835 +1100 commit: fourth commit cool
|
||||
67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 4b6f90d670c40e5ac78d9c405a5bc40932a0980b CI <CI@example.com> 1643618835 +1100 commit: fifth commit nice
|
||||
4b6f90d670c40e5ac78d9c405a5bc40932a0980b 796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 CI <CI@example.com> 1643618835 +1100 commit: sixth commit haha
|
||||
796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 41893d444283aa0c46aa7b5ee01811522cca473d CI <CI@example.com> 1643618835 +1100 commit: seventh commit yeah
|
||||
41893d444283aa0c46aa7b5ee01811522cca473d d88617710499a59992caf98d6df1b5f981c58ab1 CI <CI@example.com> 1643618835 +1100 commit: eighth commit woo
|
||||
d88617710499a59992caf98d6df1b5f981c58ab1 d88617710499a59992caf98d6df1b5f981c58ab1 CI <CI@example.com> 1643618835 +1100 checkout: moving from feature/cherry-picking to develop
|
||||
d88617710499a59992caf98d6df1b5f981c58ab1 fa5c5dac095b577173e47b4a0c139525eced009f CI <CI@example.com> 1643618835 +1100 commit: first commit on develop
|
||||
fa5c5dac095b577173e47b4a0c139525eced009f f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI <CI@example.com> 1643618835 +1100 checkout: moving from develop to master
|
||||
f37ec566036d715d6995f55dbc82a4fb3cf56f2f abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI <CI@example.com> 1643618835 +1100 commit: first commit on master
|
||||
abdaa06b758aa198cc4afb9c406c87c5690d0ca0 fa5c5dac095b577173e47b4a0c139525eced009f CI <CI@example.com> 1643618835 +1100 checkout: moving from master to develop
|
||||
fa5c5dac095b577173e47b4a0c139525eced009f 6c590c6a21f4e6d335528b5ecf6c52993b914996 CI <CI@example.com> 1643618835 +1100 commit: second commit on develop
|
||||
6c590c6a21f4e6d335528b5ecf6c52993b914996 abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI <CI@example.com> 1643618835 +1100 checkout: moving from develop to master
|
||||
abdaa06b758aa198cc4afb9c406c87c5690d0ca0 dd401e3ee3d58b648207cee7f737364a37139bea CI <CI@example.com> 1643618835 +1100 commit: second commit on master
|
||||
dd401e3ee3d58b648207cee7f737364a37139bea 6c590c6a21f4e6d335528b5ecf6c52993b914996 CI <CI@example.com> 1643618835 +1100 checkout: moving from master to develop
|
||||
6c590c6a21f4e6d335528b5ecf6c52993b914996 b2afb2548f2d143fdd691058f2283b03933a1749 CI <CI@example.com> 1643618835 +1100 commit: third commit on develop
|
||||
b2afb2548f2d143fdd691058f2283b03933a1749 dd401e3ee3d58b648207cee7f737364a37139bea CI <CI@example.com> 1643618835 +1100 checkout: moving from develop to master
|
||||
dd401e3ee3d58b648207cee7f737364a37139bea 34d20faa891d1857610dce8f790a35b702ebd7ee CI <CI@example.com> 1643618835 +1100 commit: third commit on master
|
||||
34d20faa891d1857610dce8f790a35b702ebd7ee b2afb2548f2d143fdd691058f2283b03933a1749 CI <CI@example.com> 1643618835 +1100 checkout: moving from master to develop
|
||||
b2afb2548f2d143fdd691058f2283b03933a1749 9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 CI <CI@example.com> 1643618835 +1100 commit: fourth commit on develop
|
||||
9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 34d20faa891d1857610dce8f790a35b702ebd7ee CI <CI@example.com> 1643618835 +1100 checkout: moving from develop to master
|
||||
34d20faa891d1857610dce8f790a35b702ebd7ee d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI <CI@example.com> 1643618835 +1100 commit: fourth commit on master
|
||||
d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI <CI@example.com> 1643618835 +1100 checkout: moving from master to base_branch
|
||||
d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 commit: file
|
||||
c62b5bc94e327ddb9b545213ff77b207ade48aba c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 checkout: moving from base_branch to other_branch
|
||||
c62b5bc94e327ddb9b545213ff77b207ade48aba c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 checkout: moving from other_branch to base_branch
|
||||
c62b5bc94e327ddb9b545213ff77b207ade48aba a51a44d96e13555215619b32065d0a22d95b8476 CI <CI@example.com> 1643618835 +1100 commit: file changed
|
||||
a51a44d96e13555215619b32065d0a22d95b8476 c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 checkout: moving from base_branch to other_branch
|
||||
c62b5bc94e327ddb9b545213ff77b207ade48aba d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2 CI <CI@example.com> 1643618855 +1100 commit (merge): Merge branch 'develop' into other_branch
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
0000000000000000000000000000000000000000 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI <CI@example.com> 1643188552 +1100 branch: Created from HEAD
|
||||
cd97d8e8ca03000f761f0e041cea0b6039923e70 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100 commit: file
|
||||
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 06d48b81c12e9c1a3cc2704c0db337639a8cdf85 CI <CI@example.com> 1643188552 +1100 commit: file changed
|
||||
0000000000000000000000000000000000000000 d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI <CI@example.com> 1643618835 +1100 branch: Created from HEAD
|
||||
d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 commit: file
|
||||
c62b5bc94e327ddb9b545213ff77b207ade48aba a51a44d96e13555215619b32065d0a22d95b8476 CI <CI@example.com> 1643618835 +1100 commit: file changed
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
0000000000000000000000000000000000000000 1fb30058516518ac1579a8df132b0e4dade8e51d CI <CI@example.com> 1643188552 +1100 branch: Created from HEAD
|
||||
1fb30058516518ac1579a8df132b0e4dade8e51d 40844e90419651d425c0845ec6f7c64ff63ebf03 CI <CI@example.com> 1643188552 +1100 commit: first commit on develop
|
||||
40844e90419651d425c0845ec6f7c64ff63ebf03 9c59217622ae74189d18f2992121f97dd28e966b CI <CI@example.com> 1643188552 +1100 commit: second commit on develop
|
||||
9c59217622ae74189d18f2992121f97dd28e966b ba211bf3464f9c0429483a83963c1c69e1f53d4e CI <CI@example.com> 1643188552 +1100 commit: third commit on develop
|
||||
ba211bf3464f9c0429483a83963c1c69e1f53d4e 85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b CI <CI@example.com> 1643188552 +1100 commit: fourth commit on develop
|
||||
0000000000000000000000000000000000000000 d88617710499a59992caf98d6df1b5f981c58ab1 CI <CI@example.com> 1643618835 +1100 branch: Created from HEAD
|
||||
d88617710499a59992caf98d6df1b5f981c58ab1 fa5c5dac095b577173e47b4a0c139525eced009f CI <CI@example.com> 1643618835 +1100 commit: first commit on develop
|
||||
fa5c5dac095b577173e47b4a0c139525eced009f 6c590c6a21f4e6d335528b5ecf6c52993b914996 CI <CI@example.com> 1643618835 +1100 commit: second commit on develop
|
||||
6c590c6a21f4e6d335528b5ecf6c52993b914996 b2afb2548f2d143fdd691058f2283b03933a1749 CI <CI@example.com> 1643618835 +1100 commit: third commit on develop
|
||||
b2afb2548f2d143fdd691058f2283b03933a1749 9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 CI <CI@example.com> 1643618835 +1100 commit: fourth commit on develop
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100 branch: Created from HEAD
|
||||
416ca3083a0651e1c8be3ad7e0dbe8547a62be8a f47cc13dc21c72755ff2d96d0805837dbb028951 CI <CI@example.com> 1643188552 +1100 commit: first commit freshman year
|
||||
f47cc13dc21c72755ff2d96d0805837dbb028951 34850e31f804a946d014b14443cf7387546877b0 CI <CI@example.com> 1643188552 +1100 commit: second commit subway eat fresh
|
||||
34850e31f804a946d014b14443cf7387546877b0 66340a9343a65aec523bfc57bd5a870eb4e05959 CI <CI@example.com> 1643188552 +1100 commit: third commit fresh
|
||||
66340a9343a65aec523bfc57bd5a870eb4e05959 f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec CI <CI@example.com> 1643188552 +1100 commit: fourth commit cool
|
||||
f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec 4abe915d16bbc10f38b578390ff74c9ae62bf503 CI <CI@example.com> 1643188552 +1100 commit: fifth commit nice
|
||||
4abe915d16bbc10f38b578390ff74c9ae62bf503 93d727583328b5ce8f717380d014b87bd7893222 CI <CI@example.com> 1643188552 +1100 commit: sixth commit haha
|
||||
93d727583328b5ce8f717380d014b87bd7893222 951a2354eb5856644b0f1db74becc04c908beaa3 CI <CI@example.com> 1643188552 +1100 commit: seventh commit yeah
|
||||
951a2354eb5856644b0f1db74becc04c908beaa3 1fb30058516518ac1579a8df132b0e4dade8e51d CI <CI@example.com> 1643188552 +1100 commit: eighth commit woo
|
||||
0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI <CI@example.com> 1643618835 +1100 branch: Created from HEAD
|
||||
f37ec566036d715d6995f55dbc82a4fb3cf56f2f 21730e75ee0eec374cc54eb1140d24e03db834fc CI <CI@example.com> 1643618835 +1100 commit: first commit freshman year
|
||||
21730e75ee0eec374cc54eb1140d24e03db834fc 0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd CI <CI@example.com> 1643618835 +1100 commit: second commit subway eat fresh
|
||||
0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd 72c9bf1e687e81778850d517953c64f03adbaa1b CI <CI@example.com> 1643618835 +1100 commit: third commit fresh
|
||||
72c9bf1e687e81778850d517953c64f03adbaa1b 67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 CI <CI@example.com> 1643618835 +1100 commit: fourth commit cool
|
||||
67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 4b6f90d670c40e5ac78d9c405a5bc40932a0980b CI <CI@example.com> 1643618835 +1100 commit: fifth commit nice
|
||||
4b6f90d670c40e5ac78d9c405a5bc40932a0980b 796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 CI <CI@example.com> 1643618835 +1100 commit: sixth commit haha
|
||||
796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 41893d444283aa0c46aa7b5ee01811522cca473d CI <CI@example.com> 1643618835 +1100 commit: seventh commit yeah
|
||||
41893d444283aa0c46aa7b5ee01811522cca473d d88617710499a59992caf98d6df1b5f981c58ab1 CI <CI@example.com> 1643618835 +1100 commit: eighth commit woo
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100 commit (initial): first commit
|
||||
416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI <CI@example.com> 1643188552 +1100 commit: first commit on master
|
||||
165a3cfaf6a1d3d757fb7b1c509598a395108079 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI <CI@example.com> 1643188552 +1100 commit: second commit on master
|
||||
454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f a83aac98467d005729bc9d80fe98abba47d41495 CI <CI@example.com> 1643188552 +1100 commit: third commit on master
|
||||
a83aac98467d005729bc9d80fe98abba47d41495 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI <CI@example.com> 1643188552 +1100 commit: fourth commit on master
|
||||
0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI <CI@example.com> 1643618835 +1100 commit (initial): first commit
|
||||
f37ec566036d715d6995f55dbc82a4fb3cf56f2f abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI <CI@example.com> 1643618835 +1100 commit: first commit on master
|
||||
abdaa06b758aa198cc4afb9c406c87c5690d0ca0 dd401e3ee3d58b648207cee7f737364a37139bea CI <CI@example.com> 1643618835 +1100 commit: second commit on master
|
||||
dd401e3ee3d58b648207cee7f737364a37139bea 34d20faa891d1857610dce8f790a35b702ebd7ee CI <CI@example.com> 1643618835 +1100 commit: third commit on master
|
||||
34d20faa891d1857610dce8f790a35b702ebd7ee d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI <CI@example.com> 1643618835 +1100 commit: fourth commit on master
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
0000000000000000000000000000000000000000 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100 branch: Created from HEAD
|
||||
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 4c1db169d59c4345aba213cb79934f4e38222f02 CI <CI@example.com> 1643188579 +1100 commit (merge): Merge branch 'develop' into other_branch
|
||||
0000000000000000000000000000000000000000 c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 branch: Created from HEAD
|
||||
c62b5bc94e327ddb9b545213ff77b207ade48aba d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2 CI <CI@example.com> 1643618855 +1100 commit (merge): Merge branch 'develop' into other_branch
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x�ŽM
|
||||
Â0F]ç³$Éäg"BW=Æ4�`ÁØÒFðø¼€»�Ç{ðåµÖ¥�ÕéÔvðÅùD“ œŒ-º$ÏŽE‡’bB‡™lAµñ.¯Î„̨ YoÄdšyŽ¢çIÈ»ÈÁöÁŠßí±î0Œp Æ»|¸nO¹äµÞÀ‡†È{ gc´V�öSMþÔUYö£Á¯‚õ•� «/+?Ž
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1 @@
|
||||
x█▌Kj1╫ж)z ё_{L0лj▌яj╫фкcd°шг░ d[TAИчзuPПЯ0:@╙╗~│"╔░0уh│Q"$╗.1▒ы=╓Ц>хБ ≥╖хУХsЕeи√s-:IV╒Zf ФД{\ЖNКF╖u;Ц%Мqц╖НМ▀<╖х~·c╕О╖и╫И{jЮ÷╨ЁkЗ╚х:·≈&wЗ│tВ ДBC╧
|
||||
Binary file not shown.
@ -0,0 +1,3 @@
|
||||
x�ÎA
|
||||
Â0…a×9ÅìÉt¦ÉD„®zŒi3¥cKŒàñ-x·�ÿƒ7m9¯ß�j1ƒ£è [O Ibd ºÑ8±ÌÊBÆ:»]‹=+¤Ä �Ì(µ2–ÆÇÉ,Α"VŠH‡U§ïºlú®ýp·�æýa—iË7ÀÀP„Z8#zïŽõ8UíÏÜÕe- ~
|
||||
¶'d} Ø}Îç?+
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,3 @@
|
||||
x█▌K
|
||||
б0@]ГЁd▓≤ ┬]У⌠и■
|
||||
ф√Eooю ╦}╪▐≈Z╞
З]шD══г)Ц┐vLнe<Jр⌠#1║нTJJV╜╢и╫AH· u ≥Ё)K▌)'·≤┐╓,н╨(^яЁмкц╖a╪х⌡Йz⌠/У з ╜в1Z{╜U╖}╙и÷╨zх╚©лПКЮ#4╚/+м?Б
|
||||
@ -1,2 +0,0 @@
|
||||
x��M
|
||||
Β0…]η³$Σtς"BW=Ζd’Ά`��FπψΌ€ΛχψΎΗ“ZΚ³Α€ϊΤφ�A‰Ω‹uθD[¶θ��.Ϊyμq�‹ς”ΤΖ{^ %6²πb“I�ά�q��‚gµΧ.(~·Gέa�α:Νχόα²½ςEjΉυ�Ρ χD�µV½ν§ZώWG–Ί&ψiPW(|t[}i>?Ο
|
||||
Binary file not shown.
@ -0,0 +1,3 @@
|
||||
x�Ž]
|
||||
Â0}Î)ö]�üuMADèS�±Ù|¡kK‰àñ-x_‡]—enäm<µ À°¨�W†ïÁ±OV¯® fÉl9_$©ÙdÇ«_³$¸Þ©ô¨šÔqêDJIà’>ÇÎÈ»MëNÃH·a|à#ËöÄE×åNŽc`—Rèè융æ ÇTߺ©smý*zÍ
|
||||
ó!»?·
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x��K
|
||||
آ0@]ه�d�L>�� #�Liءظ#x| ^�ٍك=x�ص�v0وN��@�)�أآ)�ة&{#�Cـآآق
;xت�ش��<;X�إي9"��|AMY�م9ظ �BF��}ع�\اى.�T��\x�7ذ�،�ر9gصA��.ي�/k+ِ�`nْZشjc>
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,2 @@
|
||||
x��K
|
||||
Β0@]η³$�¤ "tΥcLf&΄`m‰<Ύ/ΰφρ <ΪΦuι`u8υ&�1QΠLXΌ-¶D+�R"&!‰V³Ά/μΥ�M� tΝ4”\
!YMΡΙ`%suΎFΞΕUL ‰Xα»Ο[ƒq‚λ8έεƒλώ� mλ
Lτ.��]€³1Z«ƒ S]ώΤU�—Ζπ« 6yΝκ ¨τ@”
|
||||
Binary file not shown.
@ -0,0 +1,2 @@
|
||||
x�ŽK
|
||||
1D]ç½$�oˆ³šct~D0Î0F˜ãð®ªxÔƒŠkk�JšSßs†ˆ)¡qÆ;6¬})ÅÛ@äP±GR„™IKbã=¿:˜àÊ$“ó2™-GOiÕ²
#&XN$ƒàO¯ëó×y¹çƒÛöÌ—¸¶ 3Ú!‘¶pF”R :Nõüç\¼ G¯ð³ reñá†=‰
|
||||
@ -1,3 +0,0 @@
|
||||
x�ŽA
|
||||
à E»ö³/G'F¡”BV9†Ž#)$1Szüz�n ÿ} ×ey50ˆ—¶‹€ÄHžŠÍÔ &Ÿ|.ԧ̆¼„€F÷Ì6«-î²6HñTS±ä¨Ödy½
Î2² ‚¥;¯DÅ£Mu‡a„û0>å—m–×åèÈ¢÷]gàŠ¨µ:éÕäϹ*õØÛ?
ê
|
||||
YÞ2×M}OÆA7
|
||||
@ -1,3 +0,0 @@
|
||||
xŤŽK
|
||||
Â0@]çł$“ďD„®zŚI:!‚±ĄFčń-x·Ź÷ŕ奵GŁÝ©o"�qžŃ;¶±”}"
|
||||
h8"Ba˛É“Zy“WÇIô3†”2ęb)ůHvĐGčňŔL*^[Ĺź^—
Ć ®ăt—ťŰú”K^Ú
08‹DŢ8#jzLuůSWďÇŢ+ü*¨\Y}°=í
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,2 @@
|
||||
x�ÎK
|
||||
Â0€a×9Eö‚dòšD„®zŒÉdb öA‰àñíÜþ|‹Ÿ·e™»†œ/ýÑ
|dlXzÄÄ@ÕpË$E|¶Þ"c«v:d횣-¡pöâ,ÖZr >Xp!k�ªøD…}ú´ zõ}Ÿò¥eË�·å¡!z!%ôÀuÖsªËŸ\µù-š'Z_RÕË=K
|
||||
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x�ÎA
|
||||
à @Ñ®=…ûB™Ñ¨3PJ!« cÔ‘’& =~s„n?oñ˶®s·Èx釪u@¡P ÊA+Ö¡f'™©Å˜9�Ô”Ì.‡¾»-•S%¥"à ¥ˆ
,*�#xfç5�‘Om‡ '{ §§~eݽ•m}XŒƒG¢œ½"˜³žS]ÿä¦Í‹š >"94
|
||||
Binary file not shown.
@ -0,0 +1,4 @@
|
||||
xŤŽM
|
||||
�0F»Î)f_(3N (ĄŕĘcägDAŤHZzü
|
||||
˝@·ß{ľTÖu®Đ^ęˇ
|
||||
â$·�0‡–BĄŤÔ2b´8Ú‘Q�%™= şUđÉ & úĚě\ÓE§i<I#ÂQČŠx^u*ôÜűá©ź°î‹ŢRY @޲§®cW"Ds®ç©Şę¦Nó‘áWAŮ ë[—˛›/@…?›
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,5 @@
|
||||
xŤŽK
|
||||
Â0@]çłd¦m~ "tŐcL“*Sj
|
||||
ß‚pűx^ŞĄ<t„§¶‰@?$?�#Ť.hŠ–’’GF"ĺŔłJÎsĘfĺM^íđs‡Ę "e
|
||||
Ö;Âś$¨ŹČ˝ť=v2g/bxoKÝ`śŕ:NwůpYźrIµÜ€ÜĐ;
|
||||
ˇ·p&B4=¦šü©űÖřeP_Př}Ôć W�AŤ
|
||||
Binary file not shown.
@ -0,0 +1,3 @@
|
||||
x█▌M
|
||||
б0F]ГЁ$⌠L~
|
||||
"BW=фt:╣┌1╔DТЬ╪─ш▐В ÷тRН
°╔CшT!e c°■Xфя9Нtgv)ф4Т1K ЁР╕о└╧С╧Л≥╜PdNcP╣≤┐s"LиO├_m╘Т°ША╙ .КCORк0р·мы8"ZkЖu?уТOэХЩ╤╢~╪k5_≈ =%
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x��A
|
||||
1=ηs$“dcaOϋ�ΙlγJ� ΏwΑxk�*h]j½vrμ7½δ �™P„ΰμμ‹‹Θ βTsΜRD’yHΓ½Sΰ¨βmςbγΐ`M^ζύf¤!μ%Ίu�‘WΏ,�Ζ‰�γtΖ[κγ†�.υD ƒη”†ΑΡ–ΩZ³�υTΗ�Ί)Χφμτ«¨4</Uξτ�4ση?CΎ
|
||||
Binary file not shown.
@ -0,0 +1,2 @@
|
||||
x��M
|
||||
Β0F]η³$ΣLώ@Dθ�ΗH“ �¦Δ( ί‚pχρxΎXKY: (O½1Γ@&[r–¥c£”�qζHR+¶‘t�*J$φΠxλ��3h-Jς>hούCφ.™”qΦΗΒ¨]�Q„WΤγΧqΊσ'”}εK¬εhHtNi8#J)z�κό§.ς�� ~Τ
Ώy»ψ[?�
|
||||
@ -1 +1 @@
|
||||
06d48b81c12e9c1a3cc2704c0db337639a8cdf85
|
||||
a51a44d96e13555215619b32065d0a22d95b8476
|
||||
|
||||
@ -1 +1 @@
|
||||
85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b
|
||||
9a92a03fdc6eb492ea1ac7acf4fdb04962092f81
|
||||
|
||||
@ -1 +1 @@
|
||||
1fb30058516518ac1579a8df132b0e4dade8e51d
|
||||
d88617710499a59992caf98d6df1b5f981c58ab1
|
||||
|
||||
@ -1 +1 @@
|
||||
cd97d8e8ca03000f761f0e041cea0b6039923e70
|
||||
d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802
|
||||
|
||||
@ -1 +1 @@
|
||||
4c1db169d59c4345aba213cb79934f4e38222f02
|
||||
d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2
|
||||
|
||||
@ -1 +1 @@
|
||||
test2
|
||||
test3
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
Here is a story that has been told throuhg the ages
|
||||
once upon a time there was a dog
|
||||
once upon a time there was a cat
|
||||
...
|
||||
...
|
||||
...
|
||||
@ -60,4 +60,4 @@ once upon a time there was a dog
|
||||
...
|
||||
...
|
||||
...
|
||||
once upon a time there was another dog
|
||||
once upon a time there was another cat
|
||||
|
||||
@ -1 +1 @@
|
||||
once upon a time there was a horse
|
||||
once upon a time there was a mouse
|
||||
|
||||
@ -1 +1 @@
|
||||
once upon a time there was a mouse
|
||||
once upon a time there was a horse
|
||||
|
||||
@ -1 +1 @@
|
||||
{"KeyEvents":[{"Timestamp":626,"Mod":0,"Key":259,"Ch":0},{"Timestamp":930,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1065,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1202,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1818,"Mod":0,"Key":256,"Ch":77},{"Timestamp":2234,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2929,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3474,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3739,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3890,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4401,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4714,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5681,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6003,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6226,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8394,"Mod":2,"Key":2,"Ch":2},{"Timestamp":9194,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9691,"Mod":0,"Key":258,"Ch":0},{"Timestamp":9842,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10041,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10322,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10610,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11682,"Mod":2,"Key":2,"Ch":2},{"Timestamp":12113,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12458,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12994,"Mod":0,"Key":257,"Ch":0},{"Timestamp":13210,"Mod":0,"Key":256,"Ch":32},{"Timestamp":13842,"Mod":2,"Key":2,"Ch":2},{"Timestamp":15075,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15290,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15890,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16778,"Mod":0,"Key":257,"Ch":0},{"Timestamp":17130,"Mod":0,"Key":256,"Ch":32},{"Timestamp":17546,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18250,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18626,"Mod":0,"Key":257,"Ch":0},{"Timestamp":18882,"Mod":0,"Key":256,"Ch":32},{"Timestamp":19210,"Mod":0,"Key":256,"Ch":32},{"Timestamp":19762,"Mod":0,"Key":257,"Ch":0},{"Timestamp":20002,"Mod":0,"Key":256,"Ch":32},{"Timestamp":20322,"Mod":0,"Key":256,"Ch":32},{"Timestamp":20746,"Mod":0,"Key":256,"Ch":32},{"Timestamp":21138,"Mod":0,"Key":256,"Ch":32},{"Timestamp":22724,"Mod":0,"Key":27,"Ch":0},{"Timestamp":24410,"Mod":0,"Key":256,"Ch":77},{"Timestamp":25725,"Mod":0,"Key":27,"Ch":0},{"Timestamp":26017,"Mod":0,"Key":256,"Ch":109},{"Timestamp":26745,"Mod":0,"Key":13,"Ch":13},{"Timestamp":27826,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
|
||||
{"KeyEvents":[{"Timestamp":682,"Mod":0,"Key":259,"Ch":0},{"Timestamp":929,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1104,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1417,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1953,"Mod":0,"Key":256,"Ch":77},{"Timestamp":2241,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2729,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3233,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3489,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4048,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4353,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4673,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4992,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5208,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6408,"Mod":2,"Key":2,"Ch":2},{"Timestamp":7145,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7625,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7841,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8056,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8520,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8897,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9233,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9633,"Mod":2,"Key":2,"Ch":2},{"Timestamp":10016,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10393,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10881,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11137,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11473,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11809,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12056,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12354,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12921,"Mod":2,"Key":2,"Ch":2},{"Timestamp":13481,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13681,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13945,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14992,"Mod":0,"Key":256,"Ch":32},{"Timestamp":15408,"Mod":0,"Key":256,"Ch":32},{"Timestamp":15929,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16185,"Mod":0,"Key":257,"Ch":0},{"Timestamp":16401,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16753,"Mod":0,"Key":256,"Ch":32},{"Timestamp":17353,"Mod":0,"Key":256,"Ch":32},{"Timestamp":17640,"Mod":0,"Key":258,"Ch":0},{"Timestamp":17825,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18249,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18457,"Mod":0,"Key":257,"Ch":0},{"Timestamp":18673,"Mod":0,"Key":256,"Ch":32},{"Timestamp":19593,"Mod":0,"Key":13,"Ch":13},{"Timestamp":20641,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"description": "Verify that when we get merge conflicts we filter out any non-conflicted files",
|
||||
"speed": 1
|
||||
"speed": 5
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user