refactor integration tests

2022-03-27 11:47:07 +11:00
parent 2b3d457aa4
commit 20ec6d98ad
3991 changed files with 1205 additions and 968 deletions
--- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4
+++ b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4
@@ -0,0 +1,4 @@
+x█мA
+1@Qв=EЖ┌$╕сv!"лj▌▒╤)
+├йXаЦш#╦Щ<Ь╔⌡=░┤╠╚Bхх╧д┘ё√├≤}TYbQрз8%╜эH╙⌠о╦Вж
+.Кvс╞ьК╘╖рМ
--- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/08/84a47e04257f4c85435a8b10ff4f15fffa63fc
+++ b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/08/84a47e04257f4c85435a8b10ff4f15fffa63fc
--- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5
+++ b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5
--- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/2d/8021ed8803ed6142d31b331850ef46246391a7
+++ b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/2d/8021ed8803ed6142d31b331850ef46246391a7
--- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/53/502c7023f80c046a1b00b45614d5ffef8977d9
+++ b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/53/502c7023f80c046a1b00b45614d5ffef8977d9
--- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/69/1ee9e9d9c654c81214f56c514ff725f46cb9e4
+++ b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/69/1ee9e9d9c654c81214f56c514ff725f46cb9e4
--- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad
+++ b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad
--- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662
+++ b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662
@@ -0,0 +1,3 @@
+xЌОA
+В0@QЧ9Eц‚Мd¦1"BW=FљLЁ`L	<ѕ=‚ЫП[ьФj}‹B§СUЛjHіGv™p%В0ЃцЋ=	Ж«ЩcЧч°@2I^Ґ\Ў¤•c( „К1{VLў	}d?ckЭО‹ЅНЛCї±о/Ѕ¤Vп=;Bb{F0G=¦†юЙM›v4?
+¤8ц
--- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/bd/2b32f02abf86a2bb79a12ab09758e44b204b34
+++ b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/bd/2b32f02abf86a2bb79a12ab09758e44b204b34
--- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/c0/565d7cfcf1039c969105f2e1c86ca5eff64381
+++ b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/c0/565d7cfcf1039c969105f2e1c86ca5eff64381
--- a/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/f2/df244fb87b6ba1d2ab484d76c66baba168a867
+++ b/test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/objects/f2/df244fb87b6ba1d2ab484d76c66baba168a867