sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-25 17:41:56 +03:00
Code Activity

fix integration test

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-31 19:48:34 +11:00
parent c703cd8f88
commit eb056576cf
63 changed files with 103 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG
View File

@ -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
#

2
test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD
View File

@ -1 +1 @@
ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab
c62b5bc94e327ddb9b545213ff77b207ade48aba

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/index
View File

Binary file not shown.

66
test/integration/mergeConflictsFiltered/expected/.git_keep/logs/HEAD
View File

@ -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

6
test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch
View File

@ -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

10
test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop
View File

@ -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

18
test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking
View File

@ -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

10
test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master
View File

@ -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

4
test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch
View File

@ -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

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/06/d48b81c12e9c1a3cc2704c0db337639a8cdf85
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079
View File

@ -1,2 +0,0 @@
x<01><>M
<EFBFBD>0F]<5D><14>$<24><>g"BW=<3D>4<EFBFBD>`<60><><EFBFBD>F<EFBFBD><46><06><><EFBFBD><EFBFBD><EFBFBD>{<7B><><EFBFBD>֥<EFBFBD><D6A5><EFBFBD><EFBFBD>v<11><05><>D<EFBFBD> <0B><>-<2D>$ώE<><45>bB<62><42>lA<6C><41>.<2E>΄̨ Yo<>d<EFBFBD>y<><79><EFBFBD>IȻ<49><C8BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD>pƻ|<7C>nO<6E><4F><EFBFBD><EFBFBD><EFBFBD><04><><EFBFBD>{ gc<67>V<EFBFBD><56>SM<53><4D>UY<55><59><EFBFBD><EFBFBD><EFBFBD><EFBFBD><05><><1E>/+?<3F>

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1f/b30058516518ac1579a8df132b0e4dade8e51d
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/8e708af0dc73a41a09e79a7198ce56aef3df05
View File

Binary file not shown.

1
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/21/730e75ee0eec374cc54eb1140d24e03db834fc Normal file
View File

@ -0,0 +1 @@
x<01><>Kj1<05><>)z<08>_{L0<4C>j<EFBFBD><6A>j<EFBFBD><6A><06>cd<05><>ǐ d[TA<54><41><EFBFBD>uP<75><50>0:@<01><>~<7E>"<22><>0<EFBFBD>h<EFBFBD>Q"$<24>.1<><31>=<3D><>><3E><><11><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD>eɖs-:IV<49>Zf <0B><>{\<5C>N<EFBFBD>F<EFBFBD>u;<3B>%<25>qç<71><C3A7><EFBFBD><<3C><>~<7E>c<EFBFBD><0F><>ɽ<EFBFBD>{j<><6A><EFBFBD><EFBFBD>k<0E><><EFBFBD>:<3A><>&w<><77>t<EFBFBD> <0B>BC<42>

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/850e31f804a946d014b14443cf7387546877b0
View File

Binary file not shown.

3
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee Normal file
View File

@ -0,0 +1,3 @@
x<01><>A
<EFBFBD>0<10>a<EFBFBD>9<EFBFBD><39><05>t<EFBFBD><74>D<><44>z<EFBFBD>i3<69>cK<63><4B><EFBFBD>-x<01><><EFBFBD><EFBFBD>7m9<6D>ߝj1<6A><06><>[OI<08>bd<1F><>8<EFBFBD><38><EFBFBD>B<EFBFBD>:<3A>]<5D>=+<2B><><1E><>(<28>2<06><><EFBFBD><EFBFBD>,Α"V<>H<EFBFBD>U<EFBFBD><55><EFBFBD>l<05><01><>p<EFBFBD><70><EFBFBD><EFBFBD>a<EFBFBD>i<EFBFBD>7<EFBFBD><37>P<>Z8#z<><7A><EFBFBD>8U<38><55><EFBFBD><EFBFBD>e- ~
<EFBFBD>'d}<1D>}<01><>?+

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/40/844e90419651d425c0845ec6f7c64ff63ebf03
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/41/6ca3083a0651e1c8be3ad7e0dbe8547a62be8a
View File

Binary file not shown.

3
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/41/893d444283aa0c46aa7b5ee01811522cca473d Normal file
View File

@ -0,0 +1,3 @@
x<01><>K
<EFBFBD>0@]<5D><14>d<><64><1F>]<5D><18>ɔ
ƖEoo<6F> <0B>}<7D><07><>Z<EFBFBD>

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/45/4b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f
View File

@ -1,2 +0,0 @@
x<01><>M
<EFBFBD>0<10>]<5D><14>$<24>t<EFBFBD>"BW=<3D>d<EFBFBD><64>`<60><>F<EFBFBD><46><06><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǓZʳ<5A><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<07>ًu<D98B>D[<5B>蝍.<2E>y<>q<EFBFBD><71><11><><EFBFBD><EFBFBD>{^<1B>%6<><36>b<19>I<EFBFBD><49><EFBFBD>qҁ<>g<08><>.(~<7E>G<EFBFBD>a<EFBFBD><61>:<3A><><EFBFBD>Ჽ<EFBFBD>Ej<45><6A><EFBFBD>Ѡ<EFBFBD>D<03><11>V<EFBFBD><56><EFBFBD>Z<EFBFBD>WG<57><47>&<26>iPW(|t[}i>?<3F>

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4a/be915d16bbc10f38b578390ff74c9ae62bf503
View File

Binary file not shown.

3
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4b/6f90d670c40e5ac78d9c405a5bc40932a0980b Normal file
View File

@ -0,0 +1,3 @@
x<01><>]
<EFBFBD>0}<7D>)<29>]<5D><>uMAD<41>S<EFBFBD><53><EFBFBD>|<7C>kK<6B><4B><EFBFBD>-x_<>]<5D>en<65>m<<3C><1D><><EFBFBD><EFBFBD><01>W<EFBFBD><57><EFBFBD><EFBFBD>OV<4F><56><EFBFBD>f<EFBFBD>l9_$<24><>dǫ_<>$<24>ީ<EFBFBD>¨<EFBFBD><C2A8>q<EFBFBD>DJI<4A><49>><3E><>ȻM<C8BB>N<EFBFBD>H<EFBFBD>a|<7C>#<23><><EFBFBD>E<EFBFBD><45>N<EFBFBD>c`<60>R<EFBFBD><52>융<EFBFBD><EC9CB5><EFBFBD>Tß<54><C39F>sm<13>*z<>
<EFBFBD>!<21>?<3F>

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4c/1db169d59c4345aba213cb79934f4e38222f02
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5e/66799d4a5a3fed89757f3df445a962c9ce2d4f Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/66/340a9343a65aec523bfc57bd5a870eb4e05959
View File

@ -1,2 +0,0 @@
x<01><>K
<EFBFBD>0@]<5D><14>d<>L><11><>#<23>Li<4C><69>#x| ^<5E><><EFBFBD>=x<>պv0<76>N<EFBFBD><4E>@<40>)<29><><EFBFBD>)<29><>&{#<23>C<EFBFBD><43><EFBFBD><EFBFBD>

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/67/b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/6c/590c6a21f4e6d335528b5ecf6c52993b914996 Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/c9bf1e687e81778850d517953c64f03adbaa1b Normal file
View File

@ -0,0 +1,2 @@
x<01><>K
<EFBFBD>0@]<5D><14>$<24><> "t<>cLf&<26>`m<><<3C>/<2F><><EFBFBD><<3C><>u<EFBFBD>`u8<75>&<02>1Q<31>LX<4C>-<2D>D+<2B>R"&!<21>V<EFBFBD><1B>/<2F>ՎM<D58E>t<>4<EFBFBD>\

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/79/6a5a2670ccb2d08db89b9cfcaa07e9be5358e6 Normal file
View File

@ -0,0 +1,2 @@
x<01><>K
1D]<5D><14>$<24>o<0F><08><>ct~D0<44>0F<30><46><1B><02><>xԃ<78>kk<6B>J<>S<EFBFBD>s<EFBFBD><73>)<29>q<EFBFBD>;6<>})<29><>@<40>P<EFBFBD>GR<47><52>IKb<4B>=<3D>:<3A><><EFBFBD>$<24><>2<1A>-GOiղ

3
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/85/aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b
View File

@ -1,3 +0,0 @@
x<01><>A
<EFBFBD> E<><45><14>/G'F<><46>BV9<56><39>#)$1Sz<53>z<>n<1F>}<1E>ey50<35><30><EFBFBD><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><13><><EFBFBD> &<26>|.ԧ̆<D4A7><CC86><EFBFBD>F<EFBFBD><46>6<EFBFBD>-<2D><>6H<36>TS<54><53><EFBFBD><04>dy<1B>
<EFBFBD>2<EFBFBD> <0B><>;<3B>DţMu<4D>a<EFBFBD><61>0><3E><13>m<EFBFBD><1B><><01>Ȣ<EFBFBD>]g<><67><EFBFBD><EFBFBD>:<3A><19><>Ϲ*<2A><><EFBFBD>?

3
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/93/d727583328b5ce8f717380d014b87bd7893222
View File

@ -1,3 +0,0 @@
x<01><>K
<EFBFBD>0@]<5D><14>$<24><>D<><44>z<EFBFBD>I:!<21><><EFBFBD>F<EFBFBD><46>-x<01><><EFBFBD><EFBFBD>奵G<07>ݩo"<22>q<EFBFBD><71>;<3B><><EFBFBD>}"
h8"Ba<42>ɓZy<5A>W<07>I<06>3<EFBFBD><33>2<EFBFBD>b)<29>Hv<48>G<EFBFBD><47><EFBFBD>L*^[ş^<5E>

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/1a2354eb5856644b0f1db74becc04c908beaa3
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9a/92a03fdc6eb492ea1ac7acf4fdb04962092f81 Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9c/59217622ae74189d18f2992121f97dd28e966b
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/1a44d96e13555215619b32065d0a22d95b8476 Normal file
View File

@ -0,0 +1,2 @@
x<01><>K
<EFBFBD>0<10>a<EFBFBD>9E<39><45>d<EFBFBD><64>D<><44>z<EFBFBD><7A>db <0B>A<EFBFBD><41><EFBFBD><EFBFBD><11><>|<7C><><EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD>/<2F><10>

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a8/3aac98467d005729bc9d80fe98abba47d41495
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab
View File

@ -1,2 +0,0 @@
x<01><>A
<EFBFBD> @Ѯ=<3D><>B<EFBFBD>Ѩ3PJ!<21>cԑ<06>& =~s<>n?o<>˶<EFBFBD>s<EFBFBD><73>x釪u@<40>P<EFBFBD> <04>A+֡f'<27><>Ř9<C598>Ԕ<EFBFBD>.<2E><><EFBFBD>-<2D>S%<25>"<22><01><><EFBFBD>

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 Normal file
View File

Binary file not shown.

4
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 Normal file
View File

@ -0,0 +1,4 @@
x<01><>M
<EFBFBD>0F<><46>)f_(3N(<28><><EFBFBD>c<EFBFBD>gDA<44>HZz<5A>
<EFBFBD>@<40><>{<0F>T<EFBFBD>u<EFBFBD><75>^<5E><>
<EFBFBD>$<24><>0<EFBFBD><30>B<1A><><EFBFBD>2b<32>8ڑQ<DA91>%<25>=<1C>U<EFBFBD><55> &<1A><><EFBFBD><EFBFBD>\<5C>E<EFBFBD>i<I#<23>QȊx^u*<07><03><>᩟<EFBFBD><E1A99F><EFBFBD><EFBFBD>RY@޲<><DEB2>cW"Ds<44>穪<E7A9AA><7F>N<EFBFBD><4E><EFBFBD>WA<57> <20>[<5B><><EFBFBD>/@<40>?<3F>

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ba/211bf3464f9c0429483a83963c1c69e1f53d4e
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c6/2b5bc94e327ddb9b545213ff77b207ade48aba Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/cd/97d8e8ca03000f761f0e041cea0b6039923e70
View File

Binary file not shown.

5
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d4/f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 Normal file
View File

@ -0,0 +1,5 @@
x<01><>K
<EFBFBD>0@]<5D><14>d<>m~ "t<>cL<63>*Sj
߂p<>x^<5E><><t<><74><EFBFBD><EFBFBD>@?$?<3F>#<11>.h<><68><EFBFBD><EFBFBD>GF"<22><><EFBFBD>J<EFBFBD>s<EFBFBD>f<EFBFBD>M^<5E><>s<EFBFBD><73>"e
<EFBFBD>;œ$<24><>Ƚ<EFBFBD>=v2g/bxoK<6F>`<60><>:Nw<4E>pY<70>rI<72>܀<EFBFBD><DC80>;
<EFBFBD><EFBFBD>p&B4=<3D><><EFBFBD><EFBFBD><1B><><EFBFBD><16>eP_P<5F>}<7D><> W<>A<EFBFBD>

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d7/d52ecd690fe82c7d820ddb437e82d78b0fa7b2 Normal file
View File

Binary file not shown.

3
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/8617710499a59992caf98d6df1b5f981c58ab1 Normal file
View File

@ -0,0 +1,3 @@
x<01><>M
<EFBFBD>0F]<5D><14>$<24>L~
"BW=<3D>t:<3A><>1<EFBFBD>D<EFBFBD><44><16><>ۏ<EFBFBD><1E><>R<EFBFBD>

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dd/401e3ee3d58b648207cee7f737364a37139bea Normal file
View File

Binary file not shown.

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/7ec566036d715d6995f55dbc82a4fb3cf56f2f Normal file
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f4/7cc13dc21c72755ff2d96d0805837dbb028951
View File

@ -1,2 +0,0 @@
x<01><>A
1=<3D>s$<24>dcaO<61><4F><EFBFBD>l<05>J<EFBFBD><4A><EFBFBD>w<EFBFBD>xk<78>*h]j<>vr<76>7<EFBFBD>䠊<>P<><50><02>싋<EFBFBD><1E>Ts<54>RD<52>yHýS<C3BD><53><EFBFBD>m<EFBFBD>b<EFBFBD><62>`M^<5E><>f<>!<21>%<25>u<EFBFBD><75>W<EFBFBD>,<2C>Ɖ<EFBFBD><C689>t<EFBFBD>[<5B>㆝.<2E>D<1C>甆<EFBFBD>і<EFBFBD>Z<EFBFBD><5A><EFBFBD>Tǟ<54>)<29><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>4</U<><55><EFBFBD>4<EFBFBD><05>?C<>

BIN
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f9/c5f8e0789c2eb9a6e37ba82a5b34be739989ec
View File

Binary file not shown.

2
test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fa/5c5dac095b577173e47b4a0c139525eced009f Normal file
View File

@ -0,0 +1,2 @@
x<01><>M
<EFBFBD>0F]<5D><14>$<24>L<EFBFBD>@D<><44><EFBFBD>H<EFBFBD> <16><><EFBFBD>(߂p<><70>x<0F>XKY: (O<>1<EFBFBD>@&[r<><72>c<EFBFBD><63><EFBFBD>q<EFBFBD>HR+<2B><12>t<EFBFBD>*J$<24><>x된3h-J<>>h<><68>C<>.<2E><>q<EFBFBD><71>¨]<5D>Q<EFBFBD>W<57><06><04>q<EFBFBD><71>'<27>}<7D>K<EFBFBD><4B>hHtNi8#J)z<><7A><EFBFBD><EFBFBD>.<2E>Ҟ~<15>

2
test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/base_branch
View File

@ -1 +1 @@
06d48b81c12e9c1a3cc2704c0db337639a8cdf85
a51a44d96e13555215619b32065d0a22d95b8476

2
test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/develop
View File

@ -1 +1 @@
85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b
9a92a03fdc6eb492ea1ac7acf4fdb04962092f81

2
test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/feature/cherry-picking
View File

@ -1 +1 @@
1fb30058516518ac1579a8df132b0e4dade8e51d
d88617710499a59992caf98d6df1b5f981c58ab1

2
test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/master
View File

@ -1 +1 @@
cd97d8e8ca03000f761f0e041cea0b6039923e70
d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802

2
test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/other_branch
View File

@ -1 +1 @@
4c1db169d59c4345aba213cb79934f4e38222f02
d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2

2
test/integration/mergeConflictsFiltered/expected/directory/file2
View File

@ -1 +1 @@
test2
test3

4
test/integration/mergeConflictsFiltered/expected/file1
View File

@ -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

2
test/integration/mergeConflictsFiltered/expected/file3
View File

@ -1 +1 @@
once upon a time there was a horse
once upon a time there was a mouse

2
test/integration/mergeConflictsFiltered/expected/file5
View File

@ -1 +1 @@
once upon a time there was a mouse
once upon a time there was a horse

2
test/integration/mergeConflictsFiltered/recording.json
View File

@ -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}]}

2
test/integration/mergeConflictsFiltered/test.json
View File

@ -1,4 +1,4 @@
{
"description": "Verify that when we get merge conflicts we filter out any non-conflicted files",
"speed": 1
"speed": 5
}