From eb056576cfe7d97503ef1baf3e1730c87d63976f Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 31 Jan 2022 19:48:34 +1100 Subject: [PATCH] fix integration test --- .../expected/.git_keep/COMMIT_EDITMSG | 8 +-- .../expected/.git_keep/ORIG_HEAD | 2 +- .../expected/.git_keep/index | Bin 1734 -> 1734 bytes .../expected/.git_keep/logs/HEAD | 66 +++++++++--------- .../.git_keep/logs/refs/heads/base_branch | 6 +- .../.git_keep/logs/refs/heads/develop | 10 +-- .../logs/refs/heads/feature/cherry-picking | 18 ++--- .../expected/.git_keep/logs/refs/heads/master | 10 +-- .../.git_keep/logs/refs/heads/other_branch | 4 +- .../06/d48b81c12e9c1a3cc2704c0db337639a8cdf85 | Bin 153 -> 0 bytes .../0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd | Bin 0 -> 162 bytes .../16/5a3cfaf6a1d3d757fb7b1c509598a395108079 | 2 - .../1f/b30058516518ac1579a8df132b0e4dade8e51d | Bin 155 -> 0 bytes .../20/8e708af0dc73a41a09e79a7198ce56aef3df05 | Bin 381 -> 0 bytes .../21/730e75ee0eec374cc54eb1140d24e03db834fc | 1 + .../34/850e31f804a946d014b14443cf7387546877b0 | Bin 164 -> 0 bytes .../34/d20faa891d1857610dce8f790a35b702ebd7ee | 3 + .../40/844e90419651d425c0845ec6f7c64ff63ebf03 | Bin 157 -> 0 bytes .../41/6ca3083a0651e1c8be3ad7e0dbe8547a62be8a | Bin 121 -> 0 bytes .../41/893d444283aa0c46aa7b5ee01811522cca473d | 3 + .../45/4b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f | 2 - .../4a/be915d16bbc10f38b578390ff74c9ae62bf503 | Bin 153 -> 0 bytes .../4b/6f90d670c40e5ac78d9c405a5bc40932a0980b | 3 + .../4c/1db169d59c4345aba213cb79934f4e38222f02 | Bin 201 -> 0 bytes .../5e/66799d4a5a3fed89757f3df445a962c9ce2d4f | Bin 0 -> 381 bytes .../66/340a9343a65aec523bfc57bd5a870eb4e05959 | 2 - .../67/b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 | Bin 0 -> 155 bytes .../6c/590c6a21f4e6d335528b5ecf6c52993b914996 | Bin 0 -> 158 bytes .../72/c9bf1e687e81778850d517953c64f03adbaa1b | 2 + .../72/df4fceb0be99deb091ece3f501ef80b39a876a | Bin 0 -> 74 bytes .../79/6a5a2670ccb2d08db89b9cfcaa07e9be5358e6 | 2 + .../85/aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b | 3 - .../93/d727583328b5ce8f717380d014b87bd7893222 | 3 - .../95/1a2354eb5856644b0f1db74becc04c908beaa3 | Bin 156 -> 0 bytes .../9a/92a03fdc6eb492ea1ac7acf4fdb04962092f81 | Bin 0 -> 160 bytes .../9c/59217622ae74189d18f2992121f97dd28e966b | Bin 158 -> 0 bytes .../a5/1a44d96e13555215619b32065d0a22d95b8476 | 2 + .../a8/3aac98467d005729bc9d80fe98abba47d41495 | Bin 157 -> 0 bytes .../ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab | 2 - .../ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 | Bin 0 -> 157 bytes .../b2/afb2548f2d143fdd691058f2283b03933a1749 | 4 ++ .../ba/211bf3464f9c0429483a83963c1c69e1f53d4e | Bin 158 -> 0 bytes .../c6/2b5bc94e327ddb9b545213ff77b207ade48aba | Bin 0 -> 148 bytes .../cd/97d8e8ca03000f761f0e041cea0b6039923e70 | Bin 157 -> 0 bytes .../d4/f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 | 5 ++ .../d7/d52ecd690fe82c7d820ddb437e82d78b0fa7b2 | Bin 0 -> 203 bytes .../d8/8617710499a59992caf98d6df1b5f981c58ab1 | 3 + .../dd/401e3ee3d58b648207cee7f737364a37139bea | Bin 0 -> 157 bytes .../f3/7ec566036d715d6995f55dbc82a4fb3cf56f2f | Bin 0 -> 121 bytes .../f4/7cc13dc21c72755ff2d96d0805837dbb028951 | 2 - .../f9/c5f8e0789c2eb9a6e37ba82a5b34be739989ec | Bin 155 -> 0 bytes .../fa/5c5dac095b577173e47b4a0c139525eced009f | 2 + .../expected/.git_keep/refs/heads/base_branch | 2 +- .../expected/.git_keep/refs/heads/develop | 2 +- .../refs/heads/feature/cherry-picking | 2 +- .../expected/.git_keep/refs/heads/master | 2 +- .../.git_keep/refs/heads/other_branch | 2 +- .../expected/directory/file2 | 2 +- .../mergeConflictsFiltered/expected/file1 | 4 +- .../mergeConflictsFiltered/expected/file3 | 2 +- .../mergeConflictsFiltered/expected/file5 | 2 +- .../mergeConflictsFiltered/recording.json | 2 +- .../mergeConflictsFiltered/test.json | 2 +- 63 files changed, 103 insertions(+), 91 deletions(-) delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/06/d48b81c12e9c1a3cc2704c0db337639a8cdf85 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079 delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1f/b30058516518ac1579a8df132b0e4dade8e51d delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/8e708af0dc73a41a09e79a7198ce56aef3df05 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/21/730e75ee0eec374cc54eb1140d24e03db834fc delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/850e31f804a946d014b14443cf7387546877b0 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/40/844e90419651d425c0845ec6f7c64ff63ebf03 delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/41/6ca3083a0651e1c8be3ad7e0dbe8547a62be8a create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/41/893d444283aa0c46aa7b5ee01811522cca473d delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/45/4b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4a/be915d16bbc10f38b578390ff74c9ae62bf503 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4b/6f90d670c40e5ac78d9c405a5bc40932a0980b delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4c/1db169d59c4345aba213cb79934f4e38222f02 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/5e/66799d4a5a3fed89757f3df445a962c9ce2d4f delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/66/340a9343a65aec523bfc57bd5a870eb4e05959 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/67/b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/6c/590c6a21f4e6d335528b5ecf6c52993b914996 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/c9bf1e687e81778850d517953c64f03adbaa1b create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/79/6a5a2670ccb2d08db89b9cfcaa07e9be5358e6 delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/85/aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/93/d727583328b5ce8f717380d014b87bd7893222 delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/1a2354eb5856644b0f1db74becc04c908beaa3 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9a/92a03fdc6eb492ea1ac7acf4fdb04962092f81 delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9c/59217622ae74189d18f2992121f97dd28e966b create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/1a44d96e13555215619b32065d0a22d95b8476 delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a8/3aac98467d005729bc9d80fe98abba47d41495 delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ba/211bf3464f9c0429483a83963c1c69e1f53d4e create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c6/2b5bc94e327ddb9b545213ff77b207ade48aba delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/cd/97d8e8ca03000f761f0e041cea0b6039923e70 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d4/f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d7/d52ecd690fe82c7d820ddb437e82d78b0fa7b2 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/d8/8617710499a59992caf98d6df1b5f981c58ab1 create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/dd/401e3ee3d58b648207cee7f737364a37139bea create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f3/7ec566036d715d6995f55dbc82a4fb3cf56f2f delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f4/7cc13dc21c72755ff2d96d0805837dbb028951 delete mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f9/c5f8e0789c2eb9a6e37ba82a5b34be739989ec create mode 100644 test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fa/5c5dac095b577173e47b4a0c139525eced009f diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG index 80977d9d1..f08e0d5c6 100644 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG @@ -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 # diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD index 84de0034b..c71cd262c 100644 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab +c62b5bc94e327ddb9b545213ff77b207ade48aba diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/index b/test/integration/mergeConflictsFiltered/expected/.git_keep/index index f455a20fa101c0b36c9902e54b9d2775029fbe06..bf18bbf792e3d66f1dd3646dee53bdb2be63084a 100644 GIT binary patch delta 724 zcmX@cdyH4b#WTp6fq{Vui1`!0FB0Rt#$pDe85tN@nT*+PPgJoK2T9%Bzz3EB(om^8 z6H6dc_b2IqrGPY4>fU4#Mu^;_Ru8ZokcP_LpPa&ISr0PuY0*Nk9FT^}Jz!vHT*AP> z_!a0P5g;~^_>#G&xIRZKViN14yYJ6!)~Y$YoPjSnBekfgvLG`#J2Nlc45*F)Y|e}L zpD-F~-a~Zro_MT_{$?)QF!>ClBG_B6!{xzxfHYLkqsc5x5VyZ`g_sAVp>mHWhk)gj zg{}991NDJvsNC1dOPE0Z61Pm+?+ug#(@?oDXzpOUpUta%rtH}p{!kb9>$!>7g$A97+6788G^zP6o``SA(5b@0H&cDUrm-_(ULQUDN)rC zo2CR*0;Zu#UILXE0>e{HnaznCCPpd8Ghb+%E-XL%B0!;W}=FvI8ccB)G8^k zl4SkKP^q^QODyYwQml4&CxE1wFZo@8O1)!XXk5a;!1xttvIr2Hyq@sl`bP7GH>Nb4 z+@ycOaOSP@lgAnOk~30^iYf~-le07P(v5-Y7(nK*ZB57k(X6gNRzS^rk8a);AvxWw zg<(n)?3s4uQz=TW^^OlH>~ z1xQXv>FD#Sj#{;@1S8gXF~O&hbIz{sQH+ zyiCD1gao;|0vR?8hNcRJTnc>!T_5fgFOlMWKC5uXxv+Jg@3X>v&S0cqz%}=U8h3G* u$#PfY`yrp6u&8IPOmfZ$nk}{>L&lqGrSS-agXys{*v3NB>@0V 1643188552 +1100 commit (initial): first commit -416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 checkout: moving from master to feature/cherry-picking -416ca3083a0651e1c8be3ad7e0dbe8547a62be8a f47cc13dc21c72755ff2d96d0805837dbb028951 CI 1643188552 +1100 commit: first commit freshman year -f47cc13dc21c72755ff2d96d0805837dbb028951 34850e31f804a946d014b14443cf7387546877b0 CI 1643188552 +1100 commit: second commit subway eat fresh -34850e31f804a946d014b14443cf7387546877b0 66340a9343a65aec523bfc57bd5a870eb4e05959 CI 1643188552 +1100 commit: third commit fresh -66340a9343a65aec523bfc57bd5a870eb4e05959 f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec CI 1643188552 +1100 commit: fourth commit cool -f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec 4abe915d16bbc10f38b578390ff74c9ae62bf503 CI 1643188552 +1100 commit: fifth commit nice -4abe915d16bbc10f38b578390ff74c9ae62bf503 93d727583328b5ce8f717380d014b87bd7893222 CI 1643188552 +1100 commit: sixth commit haha -93d727583328b5ce8f717380d014b87bd7893222 951a2354eb5856644b0f1db74becc04c908beaa3 CI 1643188552 +1100 commit: seventh commit yeah -951a2354eb5856644b0f1db74becc04c908beaa3 1fb30058516518ac1579a8df132b0e4dade8e51d CI 1643188552 +1100 commit: eighth commit woo -1fb30058516518ac1579a8df132b0e4dade8e51d 1fb30058516518ac1579a8df132b0e4dade8e51d CI 1643188552 +1100 checkout: moving from feature/cherry-picking to develop -1fb30058516518ac1579a8df132b0e4dade8e51d 40844e90419651d425c0845ec6f7c64ff63ebf03 CI 1643188552 +1100 commit: first commit on develop -40844e90419651d425c0845ec6f7c64ff63ebf03 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 checkout: moving from develop to master -416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI 1643188552 +1100 commit: first commit on master -165a3cfaf6a1d3d757fb7b1c509598a395108079 40844e90419651d425c0845ec6f7c64ff63ebf03 CI 1643188552 +1100 checkout: moving from master to develop -40844e90419651d425c0845ec6f7c64ff63ebf03 9c59217622ae74189d18f2992121f97dd28e966b CI 1643188552 +1100 commit: second commit on develop -9c59217622ae74189d18f2992121f97dd28e966b 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI 1643188552 +1100 checkout: moving from develop to master -165a3cfaf6a1d3d757fb7b1c509598a395108079 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI 1643188552 +1100 commit: second commit on master -454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f 9c59217622ae74189d18f2992121f97dd28e966b CI 1643188552 +1100 checkout: moving from master to develop -9c59217622ae74189d18f2992121f97dd28e966b ba211bf3464f9c0429483a83963c1c69e1f53d4e CI 1643188552 +1100 commit: third commit on develop -ba211bf3464f9c0429483a83963c1c69e1f53d4e 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI 1643188552 +1100 checkout: moving from develop to master -454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f a83aac98467d005729bc9d80fe98abba47d41495 CI 1643188552 +1100 commit: third commit on master -a83aac98467d005729bc9d80fe98abba47d41495 ba211bf3464f9c0429483a83963c1c69e1f53d4e CI 1643188552 +1100 checkout: moving from master to develop -ba211bf3464f9c0429483a83963c1c69e1f53d4e 85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b CI 1643188552 +1100 commit: fourth commit on develop -85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b a83aac98467d005729bc9d80fe98abba47d41495 CI 1643188552 +1100 checkout: moving from develop to master -a83aac98467d005729bc9d80fe98abba47d41495 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI 1643188552 +1100 commit: fourth commit on master -cd97d8e8ca03000f761f0e041cea0b6039923e70 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI 1643188552 +1100 checkout: moving from master to base_branch -cd97d8e8ca03000f761f0e041cea0b6039923e70 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 commit: file -ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 checkout: moving from base_branch to other_branch -ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 checkout: moving from other_branch to base_branch -ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 06d48b81c12e9c1a3cc2704c0db337639a8cdf85 CI 1643188552 +1100 commit: file changed -06d48b81c12e9c1a3cc2704c0db337639a8cdf85 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 checkout: moving from base_branch to other_branch -ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 4c1db169d59c4345aba213cb79934f4e38222f02 CI 1643188579 +1100 commit (merge): Merge branch 'develop' into other_branch +0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI 1643618835 +1100 commit (initial): first commit +f37ec566036d715d6995f55dbc82a4fb3cf56f2f f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI 1643618835 +1100 checkout: moving from master to feature/cherry-picking +f37ec566036d715d6995f55dbc82a4fb3cf56f2f 21730e75ee0eec374cc54eb1140d24e03db834fc CI 1643618835 +1100 commit: first commit freshman year +21730e75ee0eec374cc54eb1140d24e03db834fc 0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd CI 1643618835 +1100 commit: second commit subway eat fresh +0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd 72c9bf1e687e81778850d517953c64f03adbaa1b CI 1643618835 +1100 commit: third commit fresh +72c9bf1e687e81778850d517953c64f03adbaa1b 67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 CI 1643618835 +1100 commit: fourth commit cool +67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 4b6f90d670c40e5ac78d9c405a5bc40932a0980b CI 1643618835 +1100 commit: fifth commit nice +4b6f90d670c40e5ac78d9c405a5bc40932a0980b 796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 CI 1643618835 +1100 commit: sixth commit haha +796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 41893d444283aa0c46aa7b5ee01811522cca473d CI 1643618835 +1100 commit: seventh commit yeah +41893d444283aa0c46aa7b5ee01811522cca473d d88617710499a59992caf98d6df1b5f981c58ab1 CI 1643618835 +1100 commit: eighth commit woo +d88617710499a59992caf98d6df1b5f981c58ab1 d88617710499a59992caf98d6df1b5f981c58ab1 CI 1643618835 +1100 checkout: moving from feature/cherry-picking to develop +d88617710499a59992caf98d6df1b5f981c58ab1 fa5c5dac095b577173e47b4a0c139525eced009f CI 1643618835 +1100 commit: first commit on develop +fa5c5dac095b577173e47b4a0c139525eced009f f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI 1643618835 +1100 checkout: moving from develop to master +f37ec566036d715d6995f55dbc82a4fb3cf56f2f abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI 1643618835 +1100 commit: first commit on master +abdaa06b758aa198cc4afb9c406c87c5690d0ca0 fa5c5dac095b577173e47b4a0c139525eced009f CI 1643618835 +1100 checkout: moving from master to develop +fa5c5dac095b577173e47b4a0c139525eced009f 6c590c6a21f4e6d335528b5ecf6c52993b914996 CI 1643618835 +1100 commit: second commit on develop +6c590c6a21f4e6d335528b5ecf6c52993b914996 abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI 1643618835 +1100 checkout: moving from develop to master +abdaa06b758aa198cc4afb9c406c87c5690d0ca0 dd401e3ee3d58b648207cee7f737364a37139bea CI 1643618835 +1100 commit: second commit on master +dd401e3ee3d58b648207cee7f737364a37139bea 6c590c6a21f4e6d335528b5ecf6c52993b914996 CI 1643618835 +1100 checkout: moving from master to develop +6c590c6a21f4e6d335528b5ecf6c52993b914996 b2afb2548f2d143fdd691058f2283b03933a1749 CI 1643618835 +1100 commit: third commit on develop +b2afb2548f2d143fdd691058f2283b03933a1749 dd401e3ee3d58b648207cee7f737364a37139bea CI 1643618835 +1100 checkout: moving from develop to master +dd401e3ee3d58b648207cee7f737364a37139bea 34d20faa891d1857610dce8f790a35b702ebd7ee CI 1643618835 +1100 commit: third commit on master +34d20faa891d1857610dce8f790a35b702ebd7ee b2afb2548f2d143fdd691058f2283b03933a1749 CI 1643618835 +1100 checkout: moving from master to develop +b2afb2548f2d143fdd691058f2283b03933a1749 9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 CI 1643618835 +1100 commit: fourth commit on develop +9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 34d20faa891d1857610dce8f790a35b702ebd7ee CI 1643618835 +1100 checkout: moving from develop to master +34d20faa891d1857610dce8f790a35b702ebd7ee d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI 1643618835 +1100 commit: fourth commit on master +d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI 1643618835 +1100 checkout: moving from master to base_branch +d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 c62b5bc94e327ddb9b545213ff77b207ade48aba CI 1643618835 +1100 commit: file +c62b5bc94e327ddb9b545213ff77b207ade48aba c62b5bc94e327ddb9b545213ff77b207ade48aba CI 1643618835 +1100 checkout: moving from base_branch to other_branch +c62b5bc94e327ddb9b545213ff77b207ade48aba c62b5bc94e327ddb9b545213ff77b207ade48aba CI 1643618835 +1100 checkout: moving from other_branch to base_branch +c62b5bc94e327ddb9b545213ff77b207ade48aba a51a44d96e13555215619b32065d0a22d95b8476 CI 1643618835 +1100 commit: file changed +a51a44d96e13555215619b32065d0a22d95b8476 c62b5bc94e327ddb9b545213ff77b207ade48aba CI 1643618835 +1100 checkout: moving from base_branch to other_branch +c62b5bc94e327ddb9b545213ff77b207ade48aba d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2 CI 1643618855 +1100 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch index 1d7992ef4..9b14238c0 100644 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI 1643188552 +1100 branch: Created from HEAD -cd97d8e8ca03000f761f0e041cea0b6039923e70 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 commit: file -ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 06d48b81c12e9c1a3cc2704c0db337639a8cdf85 CI 1643188552 +1100 commit: file changed +0000000000000000000000000000000000000000 d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI 1643618835 +1100 branch: Created from HEAD +d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 c62b5bc94e327ddb9b545213ff77b207ade48aba CI 1643618835 +1100 commit: file +c62b5bc94e327ddb9b545213ff77b207ade48aba a51a44d96e13555215619b32065d0a22d95b8476 CI 1643618835 +1100 commit: file changed diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop index 52fde82d1..59e1aede7 100644 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 1fb30058516518ac1579a8df132b0e4dade8e51d CI 1643188552 +1100 branch: Created from HEAD -1fb30058516518ac1579a8df132b0e4dade8e51d 40844e90419651d425c0845ec6f7c64ff63ebf03 CI 1643188552 +1100 commit: first commit on develop -40844e90419651d425c0845ec6f7c64ff63ebf03 9c59217622ae74189d18f2992121f97dd28e966b CI 1643188552 +1100 commit: second commit on develop -9c59217622ae74189d18f2992121f97dd28e966b ba211bf3464f9c0429483a83963c1c69e1f53d4e CI 1643188552 +1100 commit: third commit on develop -ba211bf3464f9c0429483a83963c1c69e1f53d4e 85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b CI 1643188552 +1100 commit: fourth commit on develop +0000000000000000000000000000000000000000 d88617710499a59992caf98d6df1b5f981c58ab1 CI 1643618835 +1100 branch: Created from HEAD +d88617710499a59992caf98d6df1b5f981c58ab1 fa5c5dac095b577173e47b4a0c139525eced009f CI 1643618835 +1100 commit: first commit on develop +fa5c5dac095b577173e47b4a0c139525eced009f 6c590c6a21f4e6d335528b5ecf6c52993b914996 CI 1643618835 +1100 commit: second commit on develop +6c590c6a21f4e6d335528b5ecf6c52993b914996 b2afb2548f2d143fdd691058f2283b03933a1749 CI 1643618835 +1100 commit: third commit on develop +b2afb2548f2d143fdd691058f2283b03933a1749 9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 CI 1643618835 +1100 commit: fourth commit on develop diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking index a77478ee9..752d03eb6 100644 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -1,9 +1,9 @@ -0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 branch: Created from HEAD -416ca3083a0651e1c8be3ad7e0dbe8547a62be8a f47cc13dc21c72755ff2d96d0805837dbb028951 CI 1643188552 +1100 commit: first commit freshman year -f47cc13dc21c72755ff2d96d0805837dbb028951 34850e31f804a946d014b14443cf7387546877b0 CI 1643188552 +1100 commit: second commit subway eat fresh -34850e31f804a946d014b14443cf7387546877b0 66340a9343a65aec523bfc57bd5a870eb4e05959 CI 1643188552 +1100 commit: third commit fresh -66340a9343a65aec523bfc57bd5a870eb4e05959 f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec CI 1643188552 +1100 commit: fourth commit cool -f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec 4abe915d16bbc10f38b578390ff74c9ae62bf503 CI 1643188552 +1100 commit: fifth commit nice -4abe915d16bbc10f38b578390ff74c9ae62bf503 93d727583328b5ce8f717380d014b87bd7893222 CI 1643188552 +1100 commit: sixth commit haha -93d727583328b5ce8f717380d014b87bd7893222 951a2354eb5856644b0f1db74becc04c908beaa3 CI 1643188552 +1100 commit: seventh commit yeah -951a2354eb5856644b0f1db74becc04c908beaa3 1fb30058516518ac1579a8df132b0e4dade8e51d CI 1643188552 +1100 commit: eighth commit woo +0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI 1643618835 +1100 branch: Created from HEAD +f37ec566036d715d6995f55dbc82a4fb3cf56f2f 21730e75ee0eec374cc54eb1140d24e03db834fc CI 1643618835 +1100 commit: first commit freshman year +21730e75ee0eec374cc54eb1140d24e03db834fc 0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd CI 1643618835 +1100 commit: second commit subway eat fresh +0f8c9b8f1cac20c63e92e8df34f6d8b3fa74accd 72c9bf1e687e81778850d517953c64f03adbaa1b CI 1643618835 +1100 commit: third commit fresh +72c9bf1e687e81778850d517953c64f03adbaa1b 67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 CI 1643618835 +1100 commit: fourth commit cool +67b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 4b6f90d670c40e5ac78d9c405a5bc40932a0980b CI 1643618835 +1100 commit: fifth commit nice +4b6f90d670c40e5ac78d9c405a5bc40932a0980b 796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 CI 1643618835 +1100 commit: sixth commit haha +796a5a2670ccb2d08db89b9cfcaa07e9be5358e6 41893d444283aa0c46aa7b5ee01811522cca473d CI 1643618835 +1100 commit: seventh commit yeah +41893d444283aa0c46aa7b5ee01811522cca473d d88617710499a59992caf98d6df1b5f981c58ab1 CI 1643618835 +1100 commit: eighth commit woo diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master index 7f0b5ea9c..d27b9c51b 100644 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI 1643188552 +1100 commit (initial): first commit -416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI 1643188552 +1100 commit: first commit on master -165a3cfaf6a1d3d757fb7b1c509598a395108079 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI 1643188552 +1100 commit: second commit on master -454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f a83aac98467d005729bc9d80fe98abba47d41495 CI 1643188552 +1100 commit: third commit on master -a83aac98467d005729bc9d80fe98abba47d41495 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI 1643188552 +1100 commit: fourth commit on master +0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI 1643618835 +1100 commit (initial): first commit +f37ec566036d715d6995f55dbc82a4fb3cf56f2f abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI 1643618835 +1100 commit: first commit on master +abdaa06b758aa198cc4afb9c406c87c5690d0ca0 dd401e3ee3d58b648207cee7f737364a37139bea CI 1643618835 +1100 commit: second commit on master +dd401e3ee3d58b648207cee7f737364a37139bea 34d20faa891d1857610dce8f790a35b702ebd7ee CI 1643618835 +1100 commit: third commit on master +34d20faa891d1857610dce8f790a35b702ebd7ee d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI 1643618835 +1100 commit: fourth commit on master diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch index 2534238d7..5842c42d8 100644 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI 1643188552 +1100 branch: Created from HEAD -ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 4c1db169d59c4345aba213cb79934f4e38222f02 CI 1643188579 +1100 commit (merge): Merge branch 'develop' into other_branch +0000000000000000000000000000000000000000 c62b5bc94e327ddb9b545213ff77b207ade48aba CI 1643618835 +1100 branch: Created from HEAD +c62b5bc94e327ddb9b545213ff77b207ade48aba d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2 CI 1643618855 +1100 commit (merge): Merge branch 'develop' into other_branch diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/06/d48b81c12e9c1a3cc2704c0db337639a8cdf85 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/06/d48b81c12e9c1a3cc2704c0db337639a8cdf85 deleted file mode 100644 index 984eeda3bf3a66bbb65f544bcabb658b368e9008..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmV;K0A~Mq0gcX03c@fDhGEw^MfQSZ+N6_!h|pD!F`0g`1^YvZ;PLGd+`c@ESGQ%E ztEH4K^#E)k-zgW)kv(%%lF?~Nf(##^jc-_aL}PY2uvROXp_yYM4JC9wx{`%3w$i~B ziAXV_NH+4R({|W?u=jp=;w#Jk#!a{7VX5;i#TY_kuSCw7vz}8Ge{xgiH>^&wzA%~} H{Q*7dWC}}= diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/0f/8c9b8f1cac20c63e92e8df34f6d8b3fa74accd new file mode 100644 index 0000000000000000000000000000000000000000..aa6525a94e0f7b834fdfe0093eff304e7cbdac20 GIT binary patch literal 162 zcmV;T0A2rh0gaBq3c@fD1wH30_AbaK*)$1=2%h|mbn}XWwbDk^zgP4Jybd!kI*sGG zk+X5tW`Jyzk~E8m4ka>o$<-(va?L}@JwlZ1#HqQJ8P{*<88HA1sE?u=1iiJw)d|?w zK6x3`lzTf(GaZh!JskIVmhpDMMyGK{wiDmklzgDIwan&2KT{2V>SlpX*Gj*PmV5sw QFG6WF%vet54J?>KpQ4veD*ylh literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079 deleted file mode 100644 index 56bdc0b18..000000000 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F]$g"BW=4`F{֥vD -$ώEbBlA.΄̨ YodyIȻ0pƻ|nO{ gcVSMUY/+? \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1f/b30058516518ac1579a8df132b0e4dade8e51d b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/1f/b30058516518ac1579a8df132b0e4dade8e51d deleted file mode 100644 index 82cc46d1c332e183565fc440e79b42b0c2c43b29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmV;M0A&Ao0gaA93c@fD06pgwdlw{|>~0ef5qjz~l5}eYYf6de^DX!Rufq&XsmpS2 z;4B^5rV3r~A~GtalCyIu>QtO%jGag~F?vA^g~_aG(`SRon4D+Q%z;ISvYl|u9c3-W zQi(QXP05?|YIEJ7AK=^%SN)`Aedwvwx4F&m%ivwB J`2yc>J-avrOa1@= diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/8e708af0dc73a41a09e79a7198ce56aef3df05 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/20/8e708af0dc73a41a09e79a7198ce56aef3df05 deleted file mode 100644 index 01e88b75d5a2d92a5b6d5d961c9207675fcb3d5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmV-@0fPQ`0V^p=O;s>8He)a}FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N@IrC6JA{3Xuj~ql!lX= z^e-6Byj6bkI5w3g3|oZcbh8$QDOIOBI?LYQ5$VaYRRNnyQ-<}+(?d=gtIe&s5@xVm z!b_oL?!GzLRGKq9@mLrA&0MzO^*fbC+PR+{E2~lkv8l9Rn6SeCntp>ZQ~heYu&TzZ zZ?&=t&tg+)$)L31Z$s_XCmM%tNUZy|$WXRM@I|YM0T3vpWEQ0+m*f{!GR%FU#$DWH zvfS19e#oaMEb3V+lboQYrDf)%GQ=*qslXB*qT3$-4H^6!-tbg& zzIz?P%Og3Zr2K&Pi5^uX1;z}I*Tv+vu)i>seɖs-:IVZf {\NFu;%qç<~cɽ{jk:&wt BC \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/850e31f804a946d014b14443cf7387546877b0 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/850e31f804a946d014b14443cf7387546877b0 deleted file mode 100644 index 5d4a913e6253decff32e3741ab4e1545bc1f6b4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmV;V09*ff0gaA93c@fD06pgwdlw|T-EfbhAOhT4^Kd?=AQNufq(CPUCoO zKq#9wn*j>vsEL`iX7Rp{RD^vv<7PXZ#sgr_9mW^}!4}bbx6*a0*`K;wOs9K+Uk1x_ Sc;ydRUhigGF76BT<3b~@I85*W diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee new file mode 100644 index 000000000..d729e28f3 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/34/d20faa891d1857610dce8f790a35b702ebd7ee @@ -0,0 +1,3 @@ +xA +0a9tDzi3cK-x7m9ߝj1[OIbd8B:]=+(2,Α"VHUlpai7PZ8#z8Ue- ~ +'d}}?+ \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/40/844e90419651d425c0845ec6f7c64ff63ebf03 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/40/844e90419651d425c0845ec6f7c64ff63ebf03 deleted file mode 100644 index cca824fa4253ed75c93175bfb22ebdbd4857924a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0gaA93c@fD06pgwdlzIk$tDp*gr540G}&OGH6=#z`4;?u*I@=G)peaa zXu?BpBA~4+-Ucri#2JGrO_D6K5syTcGn?XUwrYz_9v!Gm29X1kV+t`5`*RGrkkJ#0 z%`r<5rmW(t-)n~E;c{Jgt? \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4a/be915d16bbc10f38b578390ff74c9ae62bf503 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4a/be915d16bbc10f38b578390ff74c9ae62bf503 deleted file mode 100644 index 8854dbe4ef85613892f103fec18cf2ed390702fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmV;K0A~Mq0gaAJ3c@fL23_YA|6Y*1A0Q%h)ng=oztDndONrp|EqDR9!wd{>tu39j zw3mJWWIQCQfz#}v6TD4Pa!?a$$;C@=Cq3oJV$TQGPBpQs5i-QY8YN{96H1OcyJBoX zFe$|Z7Wv)h?Vw?#`!GK7$!&k(##?)k^46#rozrwxN=k9kbE@M{UDT!anSK?m3qyPX H*OEUM#T`e? diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4b/6f90d670c40e5ac78d9c405a5bc40932a0980b b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4b/6f90d670c40e5ac78d9c405a5bc40932a0980b new file mode 100644 index 000000000..b238d04ca --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4b/6f90d670c40e5ac78d9c405a5bc40932a0980b @@ -0,0 +1,3 @@ +x] +0})]uMADS|kK-x_]enm<WOVfl9_$dǫ_$ީ¨qDJI>ȻMNHa|#ENc`R융Tßsm*z +!? \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4c/1db169d59c4345aba213cb79934f4e38222f02 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4c/1db169d59c4345aba213cb79934f4e38222f02 deleted file mode 100644 index 5e63d0027841f9808d6162a8511b0e379e3badc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmV;)05<=40gaEbYQ!)QL{s}Kw!0z_R%c6EK?s4XuE;lpl{_0CoGl}ikk5}Hq)$0B zZw98+b-i^uNB__pKxY<27B!wr9CdQa2{CDONeX;W*f<;eVb_MOljew$qa;_n`7jAv zR)=}i05%mQNifZSym-yZW}E|JVT~5t(MfhlNSTi<2aI{p&%V?~mn%JAuCMskb-&}O z)b)j2m_{e!W1>grn1{nXPIUYeAKuVDK)LBw7CO!N!oBV%x^2Bu?F-ubZ#Mh@0YX-j D!%8He)a}FfcPQQAo~6Eh?%k$V|@8%u6?9NMw9z>L%-RBWayi z5r^B0iiV3bc4AX$#LzLD|NhfY>uhU3v*lYKeAxJ_P^TB0N)v`HLUOuU3&WJEQyraU z@9&88WZ9~KO{FQr`sL{%CymwS)?5iQST5nE&@y-59BeAh7$m-A?kTR%(TbSF`snWa zbDOnl4ll>1(wyOm$GYfm=CTd1->EFp&i(9IS(Pe?O{E3HgcbhR^c#$s>Q~!^RW)9H ztCdxF7Mn^-2Bi&u8)~mU(KvKNV%@hzhO#w+FIr6ufIuN7vnVyWB)_PVq3FKux}jH)ObT*(0EO z;jR9Z%AGe;ZY^fo^m{HWFhB+vGf2;R`t|-d!(FQ+xD3|coMGR5NBtC%2_}RTm@+(G b7n9q<{=%So_VG&PeHAAe9s2VC7!%%Z%iX|5 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/66/340a9343a65aec523bfc57bd5a870eb4e05959 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/66/340a9343a65aec523bfc57bd5a870eb4e05959 deleted file mode 100644 index e319e7eda..000000000 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/66/340a9343a65aec523bfc57bd5a870eb4e05959 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]dL>#Li#x| ^=xպv0N@))&{#C ;xʅԞ<;X9"|AMY9BF}\.T\x7О9gA./k+`nZjc> \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/67/b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/67/b2eea3191ca9a6efc8c1685aadd8e6dbae2b45 new file mode 100644 index 0000000000000000000000000000000000000000..8bd1d7993303f7ab78fc761873be35e29186bf6a GIT binary patch literal 155 zcmV;M0A&Ao0gaAJ3IZ_@L|x|;*$a}+w*w-=tmYVN4dthafOI$JRPuR(@aBXZ}z<_I!)2J~&vdEFdbwuK+@@N$07N|E#mp&OSE&(`K}t JeF3;4KJRU5L}CB{ literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/6c/590c6a21f4e6d335528b5ecf6c52993b914996 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/6c/590c6a21f4e6d335528b5ecf6c52993b914996 new file mode 100644 index 0000000000000000000000000000000000000000..5400b19fc593885d37c76b4c14a2725f224979b4 GIT binary patch literal 158 zcmV;P0Ac@l0gaA93c@fD06pgwdlzK4n=~ni2tE0XWOs{#ZAy*e^A-Gn*I@=m>O9{X zbVR$hnZcw?VmTU?-jXu=E@3hDT9Rt&MKv>GbZg#hX)xs=L9^fxN{Epnn~%k36yhOt z!Ne4Cm|T9gYu#YHz;V2s?VacKZU?FJ38?qnQ%W3QPlV{c^gGq;Pu)FC>Z0(=pe~^H MvU^?K2a%XTo6+@8CjbBd literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/c9bf1e687e81778850d517953c64f03adbaa1b b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/c9bf1e687e81778850d517953c64f03adbaa1b new file mode 100644 index 000000000..8a19f046d --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/72/c9bf1e687e81778850d517953c64f03adbaa1b @@ -0,0 +1,2 @@ +xK +0@]$ "tcLf&`m</6WiT`_Ff%bxNXyJgWsumȢ]g:Ϲ*? -Y2M}OA7 \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/93/d727583328b5ce8f717380d014b87bd7893222 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/93/d727583328b5ce8f717380d014b87bd7893222 deleted file mode 100644 index 4eb870a9e..000000000 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/93/d727583328b5ce8f717380d014b87bd7893222 +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]$DzI:!F-x奵Gݩo"q;}" -h8"BaɓZyWI32b)HvGL*^[ş^ tK^ 08D8#jzLuSW+*\Y}= \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/1a2354eb5856644b0f1db74becc04c908beaa3 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/95/1a2354eb5856644b0f1db74becc04c908beaa3 deleted file mode 100644 index 27ac335e974a54a43fbdbe3d2e38a77f1f6a6767..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmV;N0Av4n0gaA93c@fD06pgwdlzJP(=;0p5j^>fO|qqewNj(#?=AQNufq&XnWyQ} zfU)1S#SAL;I7H??QYaci#?BHAS~-grMao)hO5WXdv0H=WYvdTjdzKuE$q*@e!HU#n ziMd8eo|&CK+c+<9I>Y{SKH6KS`_*=3o(@2L=Sd_4hAk1ITj@I0>`&c2?6tm(@ay1X KI=U}W<~}w0N=rci diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9a/92a03fdc6eb492ea1ac7acf4fdb04962092f81 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/9a/92a03fdc6eb492ea1ac7acf4fdb04962092f81 new file mode 100644 index 0000000000000000000000000000000000000000..03e4507e878d3c236bb977472c21c7579726dd07 GIT binary patch literal 160 zcmV;R0AK%j0gaAL3d0}}M!WVDvo93KF;StELRLA3KO-r`7{rtwzkyz$%kS|Xe6g1D z>YxxWy)grOuWby-l(bw8bwh>2lEMpXjA&Vr3*qJqLx-?*n%z8$qbMPc=ecp-J97>l1 zmlB+g1)WK+cCQ=s16=yyrk^yglb&*&uRwtv#pu0-BN3w6=|0u;Pu)B<*G1r$L0v%f Mty5ji7avVP=I6*s&Hw-a diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/1a44d96e13555215619b32065d0a22d95b8476 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/1a44d96e13555215619b32065d0a22d95b8476 new file mode 100644 index 000000000..9d703767e --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a5/1a44d96e13555215619b32065d0a22d95b8476 @@ -0,0 +1,2 @@ +xK +0a9EdDzdb A|e/ |dlXz@p$E|"cv:d횣-p,Zr >Xp!kD}z}eˍ!z!%us˟\-'Z_R=K \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a8/3aac98467d005729bc9d80fe98abba47d41495 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/a8/3aac98467d005729bc9d80fe98abba47d41495 deleted file mode 100644 index 20ba8aaf2e75e98570d4ca7eb73621bba30596a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0gaA93d0}}0DJZodoL7?uC7o@A*VcJjVlS%8d3{=egpkLufq(?+-hAr z3_70rE&_uI#3i7%(USK_WK3|{$0RO0D(uLLry LUq`IIC(b|TCx=L~ diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab deleted file mode 100644 index 92e71009c..000000000 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab +++ /dev/null @@ -1,2 +0,0 @@ -xA - @Ѯ=BѨ3PJ!cԑ& =~sn?o˶sx釪u@P A+֡f'Ř9Ԕ.-S%" ,*#xf5Om'{~em}XG"S]͋>"94 \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/daa06b758aa198cc4afb9c406c87c5690d0ca0 new file mode 100644 index 0000000000000000000000000000000000000000..e58f89e997c922d435906149ce37205f17eb09e4 GIT binary patch literal 157 zcmV;O0Al}m0gaA93c@fD06pgwdlw|hX45Q)2tD-~X}XIAV@n&s=UeatUWXZ&veY^^ z@Rm<)69H0`K%B-9Gdr(VnQ};+x`4tRW5ANUqFM7MuLg>p6pGPeoH|ESWF{q=#>2`% zM=VNFy_)=Pk7a{?fNMY8<&*3BluKFa4O|QuT}nuBcFtOJ&||8}pSsa`+Z+5USYA-` Le#GVr142KE?E^=p literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 new file mode 100644 index 000000000..88f896a17 --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/b2/afb2548f2d143fdd691058f2283b03933a1749 @@ -0,0 +1,4 @@ +xM +0F)f_(3N(cgDAHZz +@{Tu^ +$0B2b8ڑQ%=U &\Ei3H zpb0OvhyZt-Tp&!rQHV3UiJU>4ECw^#*&w440V@Ro8 zDQPd<_mc{*y5s`G2=`%p$|vmSCbyXP2T*SfdEa#!u0)8c(Kc1(PhHhzEeU=Vz>% diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c6/2b5bc94e327ddb9b545213ff77b207ade48aba b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/c6/2b5bc94e327ddb9b545213ff77b207ade48aba new file mode 100644 index 0000000000000000000000000000000000000000..18785a94df9496eaadbeb6a0764773f78ce55391 GIT binary patch literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8MfQRulfM}d5xVLzlFS4PjV&dD$G1mt`}h{GZoMx< zTe6pNh-fevDl(glMkokVAn{xv7s3`}p=2_rr1pHsdua9zrBO>YMFT>>P@pCNES#IG z$yv{6K;_SPZHJy_eV^v1d~@Gdxz(*dw2j_Hi|B&BT5F6t>p3;#Pp;asiuwU{2|2IN C0YuLL literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/cd/97d8e8ca03000f761f0e041cea0b6039923e70 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/cd/97d8e8ca03000f761f0e041cea0b6039923e70 deleted file mode 100644 index a14b07295610c42f5d340230cb51f4142c7d9579..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0gaAJ3c@fH0A1%4Z!bt*n=gn6UG*3*$qN;XDKQ0)Z@>$<9cEx+E#=W+ zLV48s{^^2D0-)iO;Tz*`4D|_GP56Y zAZ3$6<+Y%rZ?(a)!gX2i{GqZx`4Vfn0U9-& zE~oT$y-u*vKg}TmUP6dO71^_EQWHfVo2w1cGX-0yh^^Sv&O^2dCD`n9Arxn0t(me% zZ;fj$#%y)uDwsI)pHEDdwQIEm$w*e%aEV+Rwwg5_51MRCM)CJt`hfEVUeA|zdGNa5 zz1MSS%hr(##tTm$QZ9moIPh1_sbU7Atgre`4;?u*I|aqwUo63 z20Zkp3QEj8%Q;bGUP4B;B&KtgY|%&-Q@xN+PTu`d8;lcN$LX#gDce&|xt1FslV^<4 b2RI@QgWKso>H4ScY;CU&zsh|9ca<-}QqnfS literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f4/7cc13dc21c72755ff2d96d0805837dbb028951 b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f4/7cc13dc21c72755ff2d96d0805837dbb028951 deleted file mode 100644 index 9be5e4363..000000000 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/f4/7cc13dc21c72755ff2d96d0805837dbb028951 +++ /dev/null @@ -1,2 +0,0 @@ -xA -1=s$dcaOlJwxk*h]jvr7䠊P싋TsRDyHýSmb`M^f!%uW,Ɖt[㆝.D甆іZTǟ)4Xx^OrLZmHY$ z>e48>^u{bF1Oq=!e$D_KOjH)OL?4_D$WcQhB`C3@@w-d!ty4(WS$F~$GB(eJLY@dQ zD9(-*B}xKEUuu)XDDT7g}M|=PP diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fa/5c5dac095b577173e47b4a0c139525eced009f b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fa/5c5dac095b577173e47b4a0c139525eced009f new file mode 100644 index 000000000..0e4a74d8c --- /dev/null +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/objects/fa/5c5dac095b577173e47b4a0c139525eced009f @@ -0,0 +1,2 @@ +xM +0F]$L@DH (߂pxXKY: (O1@&[rcqHR+t*J$x된3h-J>hC.q¨]QWq'}KhHtNi8#J)z.Ҟ~ y[? \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/base_branch b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/base_branch index 05892d4c0..504dbe400 100644 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/base_branch +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/base_branch @@ -1 +1 @@ -06d48b81c12e9c1a3cc2704c0db337639a8cdf85 +a51a44d96e13555215619b32065d0a22d95b8476 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/develop b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/develop index a563ebbae..a63801a54 100644 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/develop +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/develop @@ -1 +1 @@ -85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b +9a92a03fdc6eb492ea1ac7acf4fdb04962092f81 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/feature/cherry-picking b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/feature/cherry-picking index 07d05078f..d09c7755e 100644 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/feature/cherry-picking +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/feature/cherry-picking @@ -1 +1 @@ -1fb30058516518ac1579a8df132b0e4dade8e51d +d88617710499a59992caf98d6df1b5f981c58ab1 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/master b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/master index 70e34863a..7a24b5e07 100644 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/master +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -cd97d8e8ca03000f761f0e041cea0b6039923e70 +d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 diff --git a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/other_branch b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/other_branch index 8621c3daa..1e24c496e 100644 --- a/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/other_branch +++ b/test/integration/mergeConflictsFiltered/expected/.git_keep/refs/heads/other_branch @@ -1 +1 @@ -4c1db169d59c4345aba213cb79934f4e38222f02 +d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2 diff --git a/test/integration/mergeConflictsFiltered/expected/directory/file2 b/test/integration/mergeConflictsFiltered/expected/directory/file2 index 180cf8328..df6b0d2bc 100644 --- a/test/integration/mergeConflictsFiltered/expected/directory/file2 +++ b/test/integration/mergeConflictsFiltered/expected/directory/file2 @@ -1 +1 @@ -test2 +test3 diff --git a/test/integration/mergeConflictsFiltered/expected/file1 b/test/integration/mergeConflictsFiltered/expected/file1 index 4f80ec0c7..dcd348507 100644 --- a/test/integration/mergeConflictsFiltered/expected/file1 +++ b/test/integration/mergeConflictsFiltered/expected/file1 @@ -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 diff --git a/test/integration/mergeConflictsFiltered/expected/file3 b/test/integration/mergeConflictsFiltered/expected/file3 index e3ae5c6d8..1b9ae5f5d 100644 --- a/test/integration/mergeConflictsFiltered/expected/file3 +++ b/test/integration/mergeConflictsFiltered/expected/file3 @@ -1 +1 @@ -once upon a time there was a horse +once upon a time there was a mouse diff --git a/test/integration/mergeConflictsFiltered/expected/file5 b/test/integration/mergeConflictsFiltered/expected/file5 index 1b9ae5f5d..e3ae5c6d8 100644 --- a/test/integration/mergeConflictsFiltered/expected/file5 +++ b/test/integration/mergeConflictsFiltered/expected/file5 @@ -1 +1 @@ -once upon a time there was a mouse +once upon a time there was a horse diff --git a/test/integration/mergeConflictsFiltered/recording.json b/test/integration/mergeConflictsFiltered/recording.json index 2a7ab1ab3..6d620e9e3 100644 --- a/test/integration/mergeConflictsFiltered/recording.json +++ b/test/integration/mergeConflictsFiltered/recording.json @@ -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}]} \ No newline at end of file +{"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}]} \ No newline at end of file diff --git a/test/integration/mergeConflictsFiltered/test.json b/test/integration/mergeConflictsFiltered/test.json index fc1c9236a..7402aede2 100644 --- a/test/integration/mergeConflictsFiltered/test.json +++ b/test/integration/mergeConflictsFiltered/test.json @@ -1,4 +1,4 @@ { "description": "Verify that when we get merge conflicts we filter out any non-conflicted files", - "speed": 1 + "speed": 5 }