From 1abb3cd566c70807702c8d0d79985580ea89f812 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Fri, 2 Apr 2021 08:31:30 +1100 Subject: [PATCH] more thorough merge conflict integration test --- .../expected/.git_keep/COMMIT_EDITMSG | 21 +----- .../expected/.git_keep/ORIG_HEAD | 2 +- .../mergeConflicts/expected/.git_keep/index | Bin 713 -> 1814 bytes .../expected/.git_keep/logs/HEAD | 69 +++++++++--------- .../.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 | 7 +- .../02/caf2708fbff792572b0c30efaeddd214525c94 | 3 - .../07/392b739784503a325278fedf5251ecb7c3bca9 | Bin 157 -> 0 bytes .../14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 | Bin 157 -> 0 bytes .../1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b | 5 -- .../22/3a2caff009cc142bfa9b5889963a75c8004e8a | Bin 154 -> 0 bytes .../25/8864d877e7897048a0894cad34fad2a5a4c709 | 2 + .../27/bff1745d1ab39754071c9b225971867ea2a8a8 | Bin 158 -> 0 bytes .../2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e | Bin 0 -> 158 bytes .../32/d15fd4451b6693a93d6420c8af6cfc99348e71 | Bin 0 -> 80 bytes .../34/325b634a636cb6f7fcff24cd010405e459cf90 | Bin 0 -> 155 bytes .../38/08a710b52a152bb73805fe274e0d877cf61800 | 2 + .../43/e480c08cf3864f85bef1d5698b91786926cb58 | 2 + .../47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e | Bin 0 -> 154 bytes .../49/5a8676a677db2fcd6963abc94685ab87f0f1e2 | Bin 0 -> 121 bytes .../4a/5f9db9c8d46ac099de054e42e17a157ee3909b | 3 - .../4c/6b27ac04033b33a0f84869ec015b6361f28f31 | 2 + .../4d/81feb29b83b1a26754d0f480427a13dce491f4 | Bin 154 -> 0 bytes .../4e/3f39dbce8ac07b560685d22d761138954a864a | Bin 155 -> 0 bytes .../4e/a473079cfdf1776e0d7dc114501860b8ab40c4 | 2 + .../51/c0794d2dfd4eb71cc06f5e894edd3931411057 | 3 + .../5d/7d612ecff0165ff92363cdf90acda30170038e | Bin 0 -> 147 bytes .../65/73f823441ea560245f56e735d7cbc972607341 | 2 - .../65/9aa732ccda1aaa1cd6564fdb93bf0445b5115a | Bin 146 -> 0 bytes .../66/9e34b018f5e04940e15bd9d62465c716932039 | Bin 0 -> 202 bytes .../70/5e4e70fae7dd1ea607b6ad0727bed681fa3de1 | Bin 121 -> 0 bytes .../78/129d0f826754f2f8da7af68404daf8857d83cf | Bin 0 -> 429 bytes .../78/d8f05867a79068cf661a3654e1e221f6fdc5d8 | Bin 0 -> 160 bytes .../7e/28009fced47639d5a8b45ec229bcfcc265066a | Bin 0 -> 153 bytes .../85/80d8908b1bfc6d71971e73812effa15c68ecf3 | 3 - .../86/03b3753f0207a212c71189d6154cd7a06f3f62 | Bin 0 -> 57 bytes .../91/19187695a5b19287b68b0732f9142eee7dc221 | 3 + .../91/65a12a95d3b2b9b8a0374de787af169b2c339e | Bin 0 -> 48 bytes .../9a/415e7414f26bbb93a9369576b6135e29bc7391 | 4 + .../9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 | Bin 0 -> 163 bytes .../a2/c097a7f46ce0bc1f1e5a17b280a574f34d4a21 | 2 - .../a4/6fe3d80027b2887996ba65853fb0591915d051 | Bin 0 -> 429 bytes .../b2/6567e4fd73c518dd6531825d81a389fa49fe03 | Bin 154 -> 0 bytes .../bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa | 3 + .../bf/e07eeabbfcde2e7d6856918dd494c703864b20 | 4 - .../c2/1e6aeba03d5176c28b213be71d3a02e4966c87 | Bin 0 -> 157 bytes .../c2/8b32178002cb0046454f34e77f3d86391e748d | 2 + .../ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 | Bin 0 -> 159 bytes .../d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 | 4 - .../dc/51702c869f97b9ae4e236dc7684c55816fd99a | Bin 65 -> 0 bytes .../de/8c7134958792e1bff9b33cca090287def37f7e | 2 - .../e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc | Bin 0 -> 146 bytes .../e2/17a1e8fe2e038fdc59202dee120f081ecf458f | Bin 157 -> 0 bytes .../ed/21fe1044b8600683ec6c2abbf86195a4d55461 | 1 - .../f5/794ed7a2233f8a01fea032de77d2bc6a02aaec | 2 - .../fd/64b741be226a9fe125acf45a438c089a845fea | Bin 0 -> 155 bytes .../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 +- .../mergeConflicts/expected/cherrypicking1 | 1 + .../mergeConflicts/expected/cherrypicking2 | 1 + .../mergeConflicts/expected/cherrypicking3 | 1 + .../mergeConflicts/expected/cherrypicking4 | 1 + .../mergeConflicts/expected/cherrypicking5 | 1 + .../mergeConflicts/expected/cherrypicking6 | 1 + .../mergeConflicts/expected/cherrypicking7 | 1 + .../mergeConflicts/expected/cherrypicking8 | 1 + .../mergeConflicts/expected/cherrypicking9 | 1 + .../mergeConflicts/expected/directory/file | 2 +- .../mergeConflicts/expected/directory/file2 | 2 +- test/integration/mergeConflicts/expected/file | 2 +- .../integration/mergeConflicts/expected/file3 | 2 +- .../integration/mergeConflicts/expected/file5 | 1 + .../integration/mergeConflicts/recording.json | 2 +- test/integration/mergeConflicts/test.json | 2 +- 80 files changed, 109 insertions(+), 122 deletions(-) delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/1b/bb146d9ce5c8ae1d34b7bc63fe7288adc0c26b delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/27/bff1745d1ab39754071c9b225971867ea2a8a8 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/2d/1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4e/3f39dbce8ac07b560685d22d761138954a864a create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/5d/7d612ecff0165ff92363cdf90acda30170038e delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/65/73f823441ea560245f56e735d7cbc972607341 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/65/9aa732ccda1aaa1cd6564fdb93bf0445b5115a create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/70/5e4e70fae7dd1ea607b6ad0727bed681fa3de1 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/78/129d0f826754f2f8da7af68404daf8857d83cf create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/85/80d8908b1bfc6d71971e73812effa15c68ecf3 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a2/c097a7f46ce0bc1f1e5a17b280a574f34d4a21 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/a4/6fe3d80027b2887996ba65853fb0591915d051 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/b2/6567e4fd73c518dd6531825d81a389fa49fe03 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/bc/ad87f16cdd4fd10adbf9a1976671bad9b0c8aa delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/ed/21fe1044b8600683ec6c2abbf86195a4d55461 delete mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec create mode 100644 test/integration/mergeConflicts/expected/.git_keep/objects/fd/64b741be226a9fe125acf45a438c089a845fea create mode 100644 test/integration/mergeConflicts/expected/cherrypicking1 create mode 100644 test/integration/mergeConflicts/expected/cherrypicking2 create mode 100644 test/integration/mergeConflicts/expected/cherrypicking3 create mode 100644 test/integration/mergeConflicts/expected/cherrypicking4 create mode 100644 test/integration/mergeConflicts/expected/cherrypicking5 create mode 100644 test/integration/mergeConflicts/expected/cherrypicking6 create mode 100644 test/integration/mergeConflicts/expected/cherrypicking7 create mode 100644 test/integration/mergeConflicts/expected/cherrypicking8 create mode 100644 test/integration/mergeConflicts/expected/cherrypicking9 diff --git a/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG index e4171df59..d72af3146 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/mergeConflicts/expected/.git_keep/COMMIT_EDITMSG @@ -1,20 +1 @@ -Merge branch 'base_branch' into other_branch - -# Conflicts: -# file -# -# It looks like you may be committing a merge. -# If this is not correct, please remove the file -# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/mergeConflicts/actual/.git/MERGE_HEAD -# and try again. - - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# On branch other_branch -# All conflicts fixed but you are still merging. -# -# Changes to be committed: -# modified: file -# +asd diff --git a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD index 431e026e3..49b9c3b53 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD +++ b/test/integration/mergeConflicts/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -659aa732ccda1aaa1cd6564fdb93bf0445b5115a +e00ef3be7687b4a13bf23199fe9c01767e9b98bc diff --git a/test/integration/mergeConflicts/expected/.git_keep/index b/test/integration/mergeConflicts/expected/.git_keep/index index 896aa94306b8f3db51cd8de521420ab750bcb9ef..b010ceb11694533e6f6ca8b2402ddc5c97293d04 100644 GIT binary patch literal 1814 zcmZ?q402{*U|<4bfrK>6cZ|AMD_}Gu0|N`2ve-NZhQ=if42)laYD9q8B$4r@shh0N zjihy6MI3G~DjF`%*vY_`oRL~oR9TRjoSm7MZU|Jz05-?4{x*z;nl~TaypGxY_n&@R zXIuN3E#La!!^U5QI=yJ-8NtmndHWD-9*~Bbw*cL|*Are`-)O$@#*~JWoAfUj&b(EA z@;I7##&Gj2*rtKa1JY3Q7NVQCMMzFJYhjpDb*iJY?EM{)o-A7x(9AP|n`d=a7;GMp zhMKns-Msb7(?d=gtIe&s5@xVm!b_oL?!Gx_=9$9Hvwd+4Y#xw?nztC;Jc%!vdy4CG zv?3<4KDzt<+-9ws!^_dkGlQGwc=$ZnJRl7<4;Z(o@%zMMUGz6|*@oBeR2FIHes-*^ zN)<#i&m3-^%RfV~c|aO!-coe)Camzkrr%)9RKMCTtg7+qTdl0ZvuNg7z|HfBW(J!F zq@m_5LpM)p!{3J5t4}lz-H=%KZIPjDjo^z`H1jN>=KW&n5I6ud4@^VN+m2=)n*`4f zqXwmY=U%Q_6kgTe@=ANYg*pRYN@h`Na!GzsrG8pwPAb&A4}!0caskZ)(@^ua5oI1f zs(GLU4K(MqK>qmz7!5VA1%l&qq)(qWp@(RZe(DAxe8>C6%(Tm z%N`gFHD?p5IgB}XE_(!2FTB;CQn~YH%B{srn|{xo!@vqM2b^6&<}jOW6xs%(q2{bb zHHSf2de+mg_rDqLS|!0{u>R%@`{q09ry%BlvlYl+pG@sipTKCSIcw0(dAu$rw}t(M zLG|q8mCE}nPBJ?5=RwQ?XD5(*SS4pN1i)yhIjhmkacg7VTx!q6zDVe}VCOYapX&?q z?UNwpfU^-pNRX>5Ft}|P49ye_xhjO_@;9Z2eEM;#>RSuTtskwm&FA59!(gOfz%}=U z8h3G*$#PfY`yrp6u&8IPOmYfx4F#5yjF;dlA*sU9z`)GJgaMUWy65p<)zlkbB0{5h z@|`XOc(rt2y`RmieWvW$8~#%YhtvhU{55tRk;azpP|Y_&GZ|_RB^E%U8`Z&3UdQ1% zcQj8<{qb;_%~_AB?^nEQ0-W8>yTFPkC006}5YG?oe literal 713 zcmZ?q402{*U|<4b_V^m_EP1WZw_!9R0|N_dX4)YJhQ=if42)laYD9pT?S3||_L;J0 zZ}?9s98wqX^4HjPM4EvwC9^0sxg@`+Qa>#-Cl#oU0c?)p#$p%^HSaJ{=JBJNX9O{? zP}pGWd7yb<8e(3$9GZF3;#LlCBOV(hh~=FAUCVQZxqV+eCj$%2RZw?Xu80S_3rIuV zbp+KM#+*BsJp!s1-s(@O+<7zQ)?%hjzvs?jU z7n9q<{=%So_VG&PeHAAe9s2Vi<`^T)ah~-I>>eNuHRl-d=9nPN$*X{bH;{&!bAott zOu^=a1i88b8P*Ku3Wi)C-Hw0XQBvL`b>aN1*H7XOIn~rYf=3O5k%9r&=kH1DT{PEq z{^DI{%M~5Kvrx?7NRVqNC|QMp1KrTTz|6#i0hNkfa#MjNJVduW{>i9FhG+<7w{&5eF7yOXeXBeuv?-KWafxuxY& 1601981290 +1100 commit (initial): first commit -705e4e70fae7dd1ea607b6ad0727bed681fa3de1 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 checkout: moving from master to feature/cherry-picking -705e4e70fae7dd1ea607b6ad0727bed681fa3de1 02caf2708fbff792572b0c30efaeddd214525c94 CI 1601981290 +1100 commit: first commit freshman year -02caf2708fbff792572b0c30efaeddd214525c94 f5794ed7a2233f8a01fea032de77d2bc6a02aaec CI 1601981290 +1100 commit: second commit subway eat fresh -f5794ed7a2233f8a01fea032de77d2bc6a02aaec 4d81feb29b83b1a26754d0f480427a13dce491f4 CI 1601981290 +1100 commit: third commit fresh -4d81feb29b83b1a26754d0f480427a13dce491f4 4e3f39dbce8ac07b560685d22d761138954a864a CI 1601981290 +1100 commit: fourth commit cool -4e3f39dbce8ac07b560685d22d761138954a864a 223a2caff009cc142bfa9b5889963a75c8004e8a CI 1601981290 +1100 commit: fifth commit nice -223a2caff009cc142bfa9b5889963a75c8004e8a b26567e4fd73c518dd6531825d81a389fa49fe03 CI 1601981290 +1100 commit: sixth commit haha -b26567e4fd73c518dd6531825d81a389fa49fe03 bfe07eeabbfcde2e7d6856918dd494c703864b20 CI 1601981290 +1100 commit: seventh commit yeah -bfe07eeabbfcde2e7d6856918dd494c703864b20 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 commit: eighth commit woo -1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 checkout: moving from feature/cherry-picking to develop -1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 27bff1745d1ab39754071c9b225971867ea2a8a8 CI 1601981290 +1100 commit: first commit on develop -27bff1745d1ab39754071c9b225971867ea2a8a8 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 checkout: moving from develop to master -705e4e70fae7dd1ea607b6ad0727bed681fa3de1 07392b739784503a325278fedf5251ecb7c3bca9 CI 1601981290 +1100 commit: first commit on master -07392b739784503a325278fedf5251ecb7c3bca9 27bff1745d1ab39754071c9b225971867ea2a8a8 CI 1601981290 +1100 checkout: moving from master to develop -27bff1745d1ab39754071c9b225971867ea2a8a8 6573f823441ea560245f56e735d7cbc972607341 CI 1601981290 +1100 commit: second commit on develop -6573f823441ea560245f56e735d7cbc972607341 07392b739784503a325278fedf5251ecb7c3bca9 CI 1601981290 +1100 checkout: moving from develop to master -07392b739784503a325278fedf5251ecb7c3bca9 a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI 1601981290 +1100 commit: second commit on master -a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 6573f823441ea560245f56e735d7cbc972607341 CI 1601981290 +1100 checkout: moving from master to develop -6573f823441ea560245f56e735d7cbc972607341 de8c7134958792e1bff9b33cca090287def37f7e CI 1601981290 +1100 commit: third commit on develop -de8c7134958792e1bff9b33cca090287def37f7e a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI 1601981290 +1100 checkout: moving from develop to master -a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI 1601981290 +1100 commit: third commit on master -d09f332ddbdbb1d516ca99da33b23f987e4c13c3 de8c7134958792e1bff9b33cca090287def37f7e CI 1601981290 +1100 checkout: moving from master to develop -de8c7134958792e1bff9b33cca090287def37f7e 149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 CI 1601981290 +1100 commit: fourth commit on develop -149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI 1601981290 +1100 checkout: moving from develop to master -d09f332ddbdbb1d516ca99da33b23f987e4c13c3 e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 commit: fourth commit on master -e217a1e8fe2e038fdc59202dee120f081ecf458f e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 checkout: moving from master to base_branch -e217a1e8fe2e038fdc59202dee120f081ecf458f 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 commit: file -8580d8908b1bfc6d71971e73812effa15c68ecf3 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 checkout: moving from base_branch to other_branch -8580d8908b1bfc6d71971e73812effa15c68ecf3 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 checkout: moving from other_branch to base_branch -8580d8908b1bfc6d71971e73812effa15c68ecf3 4a5f9db9c8d46ac099de054e42e17a157ee3909b CI 1601981290 +1100 commit: file changed -4a5f9db9c8d46ac099de054e42e17a157ee3909b 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 checkout: moving from base_branch to other_branch -8580d8908b1bfc6d71971e73812effa15c68ecf3 659aa732ccda1aaa1cd6564fdb93bf0445b5115a CI 1601981293 +1100 commit: asd -659aa732ccda1aaa1cd6564fdb93bf0445b5115a ed21fe1044b8600683ec6c2abbf86195a4d55461 CI 1601981298 +1100 commit (merge): Merge branch 'base_branch' into other_branch +0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI 1617312234 +1100 commit (initial): first commit +495a8676a677db2fcd6963abc94685ab87f0f1e2 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI 1617312234 +1100 checkout: moving from master to feature/cherry-picking +495a8676a677db2fcd6963abc94685ab87f0f1e2 78d8f05867a79068cf661a3654e1e221f6fdc5d8 CI 1617312234 +1100 commit: first commit freshman year +78d8f05867a79068cf661a3654e1e221f6fdc5d8 9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 CI 1617312234 +1100 commit: second commit subway eat fresh +9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 9119187695a5b19287b68b0732f9142eee7dc221 CI 1617312234 +1100 commit: third commit fresh +9119187695a5b19287b68b0732f9142eee7dc221 fd64b741be226a9fe125acf45a438c089a845fea CI 1617312234 +1100 commit: fourth commit cool +fd64b741be226a9fe125acf45a438c089a845fea 47de5d2b09400df9f5252bfb02ecb0cf2702fd3e CI 1617312234 +1100 commit: fifth commit nice +47de5d2b09400df9f5252bfb02ecb0cf2702fd3e 34325b634a636cb6f7fcff24cd010405e459cf90 CI 1617312234 +1100 commit: sixth commit haha +34325b634a636cb6f7fcff24cd010405e459cf90 bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa CI 1617312234 +1100 commit: seventh commit yeah +bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa 7e28009fced47639d5a8b45ec229bcfcc265066a CI 1617312234 +1100 commit: eighth commit woo +7e28009fced47639d5a8b45ec229bcfcc265066a 7e28009fced47639d5a8b45ec229bcfcc265066a CI 1617312234 +1100 checkout: moving from feature/cherry-picking to develop +7e28009fced47639d5a8b45ec229bcfcc265066a ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI 1617312234 +1100 commit: first commit on develop +ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI 1617312235 +1100 checkout: moving from develop to master +495a8676a677db2fcd6963abc94685ab87f0f1e2 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI 1617312235 +1100 commit: first commit on master +4c6b27ac04033b33a0f84869ec015b6361f28f31 ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI 1617312235 +1100 checkout: moving from master to develop +ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI 1617312235 +1100 commit: second commit on develop +c21e6aeba03d5176c28b213be71d3a02e4966c87 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI 1617312235 +1100 checkout: moving from develop to master +4c6b27ac04033b33a0f84869ec015b6361f28f31 9a415e7414f26bbb93a9369576b6135e29bc7391 CI 1617312235 +1100 commit: second commit on master +9a415e7414f26bbb93a9369576b6135e29bc7391 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI 1617312235 +1100 checkout: moving from master to develop +c21e6aeba03d5176c28b213be71d3a02e4966c87 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI 1617312235 +1100 commit: third commit on develop +2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 9a415e7414f26bbb93a9369576b6135e29bc7391 CI 1617312235 +1100 checkout: moving from develop to master +9a415e7414f26bbb93a9369576b6135e29bc7391 43e480c08cf3864f85bef1d5698b91786926cb58 CI 1617312235 +1100 commit: third commit on master +43e480c08cf3864f85bef1d5698b91786926cb58 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI 1617312235 +1100 checkout: moving from master to develop +2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 51c0794d2dfd4eb71cc06f5e894edd3931411057 CI 1617312235 +1100 commit: fourth commit on develop +51c0794d2dfd4eb71cc06f5e894edd3931411057 43e480c08cf3864f85bef1d5698b91786926cb58 CI 1617312235 +1100 checkout: moving from develop to master +43e480c08cf3864f85bef1d5698b91786926cb58 258864d877e7897048a0894cad34fad2a5a4c709 CI 1617312235 +1100 commit: fourth commit on master +258864d877e7897048a0894cad34fad2a5a4c709 258864d877e7897048a0894cad34fad2a5a4c709 CI 1617312235 +1100 checkout: moving from master to base_branch +258864d877e7897048a0894cad34fad2a5a4c709 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 commit: file +5d7d612ecff0165ff92363cdf90acda30170038e 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 checkout: moving from base_branch to other_branch +5d7d612ecff0165ff92363cdf90acda30170038e 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 checkout: moving from other_branch to base_branch +5d7d612ecff0165ff92363cdf90acda30170038e c28b32178002cb0046454f34e77f3d86391e748d CI 1617312235 +1100 commit: file changed +c28b32178002cb0046454f34e77f3d86391e748d 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 checkout: moving from base_branch to other_branch +5d7d612ecff0165ff92363cdf90acda30170038e e00ef3be7687b4a13bf23199fe9c01767e9b98bc CI 1617312236 +1100 commit: asd +e00ef3be7687b4a13bf23199fe9c01767e9b98bc 669e34b018f5e04940e15bd9d62465c716932039 CI 1617312262 +1100 commit (merge): Merge branch 'develop' into other_branch +669e34b018f5e04940e15bd9d62465c716932039 4ea473079cfdf1776e0d7dc114501860b8ab40c4 CI 1617312266 +1100 commit: asd diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch index 383150856..1a02889c9 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/base_branch @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 branch: Created from HEAD -e217a1e8fe2e038fdc59202dee120f081ecf458f 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 commit: file -8580d8908b1bfc6d71971e73812effa15c68ecf3 4a5f9db9c8d46ac099de054e42e17a157ee3909b CI 1601981290 +1100 commit: file changed +0000000000000000000000000000000000000000 258864d877e7897048a0894cad34fad2a5a4c709 CI 1617312235 +1100 branch: Created from HEAD +258864d877e7897048a0894cad34fad2a5a4c709 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 commit: file +5d7d612ecff0165ff92363cdf90acda30170038e c28b32178002cb0046454f34e77f3d86391e748d CI 1617312235 +1100 commit: file changed diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop index 439b9c700..0f164a9c2 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/develop @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 branch: Created from HEAD -1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b 27bff1745d1ab39754071c9b225971867ea2a8a8 CI 1601981290 +1100 commit: first commit on develop -27bff1745d1ab39754071c9b225971867ea2a8a8 6573f823441ea560245f56e735d7cbc972607341 CI 1601981290 +1100 commit: second commit on develop -6573f823441ea560245f56e735d7cbc972607341 de8c7134958792e1bff9b33cca090287def37f7e CI 1601981290 +1100 commit: third commit on develop -de8c7134958792e1bff9b33cca090287def37f7e 149c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 CI 1601981290 +1100 commit: fourth commit on develop +0000000000000000000000000000000000000000 7e28009fced47639d5a8b45ec229bcfcc265066a CI 1617312234 +1100 branch: Created from HEAD +7e28009fced47639d5a8b45ec229bcfcc265066a ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 CI 1617312234 +1100 commit: first commit on develop +ce0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 c21e6aeba03d5176c28b213be71d3a02e4966c87 CI 1617312235 +1100 commit: second commit on develop +c21e6aeba03d5176c28b213be71d3a02e4966c87 2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e CI 1617312235 +1100 commit: third commit on develop +2d1c52f1a9818ac62a981dbf9f7a95bd5aa0bf2e 51c0794d2dfd4eb71cc06f5e894edd3931411057 CI 1617312235 +1100 commit: fourth commit on develop diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking index a61959de7..74cdfb0c9 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/feature/cherry-picking @@ -1,9 +1,9 @@ -0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 branch: Created from HEAD -705e4e70fae7dd1ea607b6ad0727bed681fa3de1 02caf2708fbff792572b0c30efaeddd214525c94 CI 1601981290 +1100 commit: first commit freshman year -02caf2708fbff792572b0c30efaeddd214525c94 f5794ed7a2233f8a01fea032de77d2bc6a02aaec CI 1601981290 +1100 commit: second commit subway eat fresh -f5794ed7a2233f8a01fea032de77d2bc6a02aaec 4d81feb29b83b1a26754d0f480427a13dce491f4 CI 1601981290 +1100 commit: third commit fresh -4d81feb29b83b1a26754d0f480427a13dce491f4 4e3f39dbce8ac07b560685d22d761138954a864a CI 1601981290 +1100 commit: fourth commit cool -4e3f39dbce8ac07b560685d22d761138954a864a 223a2caff009cc142bfa9b5889963a75c8004e8a CI 1601981290 +1100 commit: fifth commit nice -223a2caff009cc142bfa9b5889963a75c8004e8a b26567e4fd73c518dd6531825d81a389fa49fe03 CI 1601981290 +1100 commit: sixth commit haha -b26567e4fd73c518dd6531825d81a389fa49fe03 bfe07eeabbfcde2e7d6856918dd494c703864b20 CI 1601981290 +1100 commit: seventh commit yeah -bfe07eeabbfcde2e7d6856918dd494c703864b20 1bbb146d9ce5c8ae1d34b7bc63fe7288adc0c26b CI 1601981290 +1100 commit: eighth commit woo +0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI 1617312234 +1100 branch: Created from HEAD +495a8676a677db2fcd6963abc94685ab87f0f1e2 78d8f05867a79068cf661a3654e1e221f6fdc5d8 CI 1617312234 +1100 commit: first commit freshman year +78d8f05867a79068cf661a3654e1e221f6fdc5d8 9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 CI 1617312234 +1100 commit: second commit subway eat fresh +9fe32ee7a110dbab694c978f1b03fa45f7cd7db6 9119187695a5b19287b68b0732f9142eee7dc221 CI 1617312234 +1100 commit: third commit fresh +9119187695a5b19287b68b0732f9142eee7dc221 fd64b741be226a9fe125acf45a438c089a845fea CI 1617312234 +1100 commit: fourth commit cool +fd64b741be226a9fe125acf45a438c089a845fea 47de5d2b09400df9f5252bfb02ecb0cf2702fd3e CI 1617312234 +1100 commit: fifth commit nice +47de5d2b09400df9f5252bfb02ecb0cf2702fd3e 34325b634a636cb6f7fcff24cd010405e459cf90 CI 1617312234 +1100 commit: sixth commit haha +34325b634a636cb6f7fcff24cd010405e459cf90 bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa CI 1617312234 +1100 commit: seventh commit yeah +bcad87f16cdd4fd10adbf9a1976671bad9b0c8aa 7e28009fced47639d5a8b45ec229bcfcc265066a CI 1617312234 +1100 commit: eighth commit woo diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master index 427cc86bd..21cc73d8b 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/master @@ -1,5 +1,5 @@ -0000000000000000000000000000000000000000 705e4e70fae7dd1ea607b6ad0727bed681fa3de1 CI 1601981290 +1100 commit (initial): first commit -705e4e70fae7dd1ea607b6ad0727bed681fa3de1 07392b739784503a325278fedf5251ecb7c3bca9 CI 1601981290 +1100 commit: first commit on master -07392b739784503a325278fedf5251ecb7c3bca9 a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 CI 1601981290 +1100 commit: second commit on master -a2c097a7f46ce0bc1f1e5a17b280a574f34d4a21 d09f332ddbdbb1d516ca99da33b23f987e4c13c3 CI 1601981290 +1100 commit: third commit on master -d09f332ddbdbb1d516ca99da33b23f987e4c13c3 e217a1e8fe2e038fdc59202dee120f081ecf458f CI 1601981290 +1100 commit: fourth commit on master +0000000000000000000000000000000000000000 495a8676a677db2fcd6963abc94685ab87f0f1e2 CI 1617312234 +1100 commit (initial): first commit +495a8676a677db2fcd6963abc94685ab87f0f1e2 4c6b27ac04033b33a0f84869ec015b6361f28f31 CI 1617312235 +1100 commit: first commit on master +4c6b27ac04033b33a0f84869ec015b6361f28f31 9a415e7414f26bbb93a9369576b6135e29bc7391 CI 1617312235 +1100 commit: second commit on master +9a415e7414f26bbb93a9369576b6135e29bc7391 43e480c08cf3864f85bef1d5698b91786926cb58 CI 1617312235 +1100 commit: third commit on master +43e480c08cf3864f85bef1d5698b91786926cb58 258864d877e7897048a0894cad34fad2a5a4c709 CI 1617312235 +1100 commit: fourth commit on master diff --git a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch index 4e8ffd4f8..f3b0e8d6b 100644 --- a/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch +++ b/test/integration/mergeConflicts/expected/.git_keep/logs/refs/heads/other_branch @@ -1,3 +1,4 @@ -0000000000000000000000000000000000000000 8580d8908b1bfc6d71971e73812effa15c68ecf3 CI 1601981290 +1100 branch: Created from HEAD -8580d8908b1bfc6d71971e73812effa15c68ecf3 659aa732ccda1aaa1cd6564fdb93bf0445b5115a CI 1601981293 +1100 commit: asd -659aa732ccda1aaa1cd6564fdb93bf0445b5115a ed21fe1044b8600683ec6c2abbf86195a4d55461 CI 1601981298 +1100 commit (merge): Merge branch 'base_branch' into other_branch +0000000000000000000000000000000000000000 5d7d612ecff0165ff92363cdf90acda30170038e CI 1617312235 +1100 branch: Created from HEAD +5d7d612ecff0165ff92363cdf90acda30170038e e00ef3be7687b4a13bf23199fe9c01767e9b98bc CI 1617312236 +1100 commit: asd +e00ef3be7687b4a13bf23199fe9c01767e9b98bc 669e34b018f5e04940e15bd9d62465c716932039 CI 1617312262 +1100 commit (merge): Merge branch 'develop' into other_branch +669e34b018f5e04940e15bd9d62465c716932039 4ea473079cfdf1776e0d7dc114501860b8ab40c4 CI 1617312266 +1100 commit: asd diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 b/test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 deleted file mode 100644 index 6a17c763e..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/02/caf2708fbff792572b0c30efaeddd214525c94 +++ /dev/null @@ -1,3 +0,0 @@ -x -0=+.nZD -Jo:ĵk#+ݮU,bD}o{pu\Ь:Vy>) ԱN{$k F_mY+M3 3c#^ltjS7Z~RNh5_$PD \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9 b/test/integration/mergeConflicts/expected/.git_keep/objects/07/392b739784503a325278fedf5251ecb7c3bca9 deleted file mode 100644 index 46101849dc9afbfa07d8207d2eb965e98e1e4d26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0gaA93c@fD06pgwdlzIkNs}yy2tD-~+h&6WV@n&s=UeatUWXZ&X{mK? zV3AL4Q-!WL^&O|t2Vt@W3wPoZr|6w>War(KY;k6lOH~-1Q@Med=Xe>J2C$aU#nIXCg#%&||9UpSmgYwm0}yu)Ltk Le#GVrLAgKc3u#5C diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 b/test/integration/mergeConflicts/expected/.git_keep/objects/14/9c4365ab13dfb2ef4dd1e2c1eec0f3b6be2ed9 deleted file mode 100644 index 2a5841f73491c7c0b6f4342d92b2f7f0bb8e9a3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0gaA93d0}}0DJZodoL7MZB;0xkW-$a>q-hS1~H}2uh0+lI?TXOE#=ig zA)b0;1`feEipV+{%NSjBDH|ITDdX6CRMHaZB=*pF>yX%yMQ!}mS+7QrvyWO61?i=7 zHgVQATNdHyOKmXCaG&NUe?r+;zECX>z?($xP' \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a b/test/integration/mergeConflicts/expected/.git_keep/objects/22/3a2caff009cc142bfa9b5889963a75c8004e8a deleted file mode 100644 index 749db6230b9a4e8a1a8da4f45ea7c28ab7465ea2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0gaAJ3c@fDKwak)vlnD0za}6ebk$=dlL;-Dwv-4S-+~u#`*;r?Z>=pI zG}=o)M8J4KsYaY;FFK01F(40Aq~?@8dRuf!fz_T4Svy!U)x?rnLSh`UJC)#y)@ATS zCPZgb@HVOR?(=rQIKh3Kp7Kd;f60xv_5kuoF_4Z3S0Y4p(sQcIpSr3`?KAu;SQi%c I1#N{sF?DK0rT_o{ diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 b/test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 new file mode 100644 index 000000000..34d3b62c9 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/25/8864d877e7897048a0894cad34fad2a5a4c709 @@ -0,0 +1,2 @@ +xM +0F]$t"#PR#x| ^{|[CDy=FI9dfrQ³Y&މ'˖XE(!&* Gi\K66]znt8 .Z=˟s~'mn@ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/27/bff1745d1ab39754071c9b225971867ea2a8a8 b/test/integration/mergeConflicts/expected/.git_keep/objects/27/bff1745d1ab39754071c9b225971867ea2a8a8 deleted file mode 100644 index 8ceca065fa785a9d6935a9526ec1fd590967e5ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0gaA93c@fD06pgwdlzIkNs|;rgr540WV6LW+msl^=UeatUWXYNF6%ls z(1fQ}ML=6Oc^kZ75N8ZBCt-`75syT+%bl5=%~tKP%GQ8VN@QK`Svn3;C>xu6VrM4t zI)s=RS-Yg-t367EVT9{2-sKb5eUS^7^#@@9%?3RhK_At@RrUr^lUSC(Xi`tkMm+>gCWxbC z7`1fX+Bi7HueOv5;{^9{ddi3MvB@o#`~b3NgS0k1T!|3Xxt^z*{E4f!tTn;Ug0e%B Mw`}E5Uv$tv=;_Q!(*OVf literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 b/test/integration/mergeConflicts/expected/.git_keep/objects/32/d15fd4451b6693a93d6420c8af6cfc99348e71 new file mode 100644 index 0000000000000000000000000000000000000000..4a9f30d37a6541161b706f5f83d163bf5149868b GIT binary patch literal 80 zcmV-W0I&ae0ZYosPf{>6FlVrV00j?MM;EUAyyR4c(t`Xvg+zst%-mFkl8n@%RE6@y mVxT}qeo=8Mmn{U~SDKq&3RG$b0SYOpWvMy&1zZ3SiX=>?Kq37A literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 b/test/integration/mergeConflicts/expected/.git_keep/objects/34/325b634a636cb6f7fcff24cd010405e459cf90 new file mode 100644 index 0000000000000000000000000000000000000000..d77ebe3af720d2314fe0844db3d3e9a7ec478145 GIT binary patch literal 155 zcmV;M0A&Ao0gaA93c@fD06pgwdlzJPlQa=Tgr540O|qc{YfFvL=UeatUWXZ&yv*~| zfYF`WrV5!#A=kOki4z-Yt-+@lJ7NhGIg(1W$w#xwrmqGr6!nD@UL9ho*Xr4GstH+h z!dy8Z*J9Pkr;W=7{Q$Rqc<3(k`qWEa<~vYF!4k7|a3(@D2R){m{;8Yyw6_s{6^t^9 J`2sM;J|fAbNi+Ze literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 b/test/integration/mergeConflicts/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 new file mode 100644 index 000000000..74bc806ad --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800 @@ -0,0 +1,2 @@ +xA +0E]ATzI34)ɴMK0 |>o\a83BQ/h Eǜ}aAsjAwތ1O*B|V'5C/Q&c۬5x70| \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 b/test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 new file mode 100644 index 000000000..0a877f7d8 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/43/e480c08cf3864f85bef1d5698b91786926cb58 @@ -0,0 +1,2 @@ +xK +0@]$o@DǘSZ0߂pxްֺ4pOmW)˔%c1y}gR/dgAG?XJa!:.C"F#6;t=\C/Zosh91OݴyGU>f(>X \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e b/test/integration/mergeConflicts/expected/.git_keep/objects/47/de5d2b09400df9f5252bfb02ecb0cf2702fd3e new file mode 100644 index 0000000000000000000000000000000000000000..dfe80867a3533d6ca8b3ef67d45d5377ca619c55 GIT binary patch literal 154 zcmV;L0A>Gp0gaA93d0}}0DJZodoL7SSEEo$A*VcJ)s+Nl5`u+3zkz=pI zP}8L!B4E8}sa70jFBrvB3_1^{NKKr)_EfNN$ZF?9)(*9JN&}fBh@N8=gN}10$7Dm+ zA#xyBg%!X1yd5x3a380qe7Nl|x#g`rz<4uQgJ=n^#%QfhdQNruQ&)AVeTH8J>ykx% I0lwir-ST%r-v9sr literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 b/test/integration/mergeConflicts/expected/.git_keep/objects/49/5a8676a677db2fcd6963abc94685ab87f0f1e2 new file mode 100644 index 0000000000000000000000000000000000000000..ae02634d4f7bba27509327d46997e67f549adc33 GIT binary patch literal 121 zcmV-<0EYi~0ga783c@fD06pgwdl#geq}v8Wgr540ZMusELrPr1=UeatUWXYb*HShE z?D1qx1SAsC!al{3XzeqSCRSN8XB{>2sv<)S$?@ABwZSyQb(-(;;j%yFl54pE5)J{q b4-w9YUFQyZOicdNoo?-A@T=SxaqKUnq<=VY literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b b/test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b deleted file mode 100644 index 4a8334d3f..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/4a/5f9db9c8d46ac099de054e42e17a157ee3909b +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]$ ]db C>ރ'۲ 0K;TB2'bTԘ4Uw$Tԙ=6mh9c -a$T֚*3Ӧa0>7ٖ` Z"ZkNzN5S7u~+Ȕ֗j< \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 b/test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 new file mode 100644 index 000000000..6db47e52d --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/4c/6b27ac04033b33a0f84869ec015b6361f28f31 @@ -0,0 +1,2 @@ +xK +1D]dO09F'cLo WTK: O1͚#*O-QZ w_iu4ńK11!Y zGm0/p;OZn Z*-&1quvtYP_PA?@ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4 b/test/integration/mergeConflicts/expected/.git_keep/objects/4d/81feb29b83b1a26754d0f480427a13dce491f4 deleted file mode 100644 index 898b64daddb17659fcf19eb7cdb318a292c10037..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0gaA93c@fD06pgwdlzK0X_FR2gr540&F+>KtSvEu&$r+Qybd!kvaRb< zfv`Q*Vg}lAk``4sHVwC7@TFGk zYe)stWprkl$tkiq+Y*V$kn*5OCvTn6j-p3G3V}fE)cHN6$sP+w6{6P>Nm)0U48?db z$`R_E*aR#_&@tB5<-ExIygd0sb>H}wT75{gfWe~*Ag_o3;-u%P!GG$aw4;wz{<3r0 JCcd_uKF~|WPMrV% diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 new file mode 100644 index 000000000..a8cba65d0 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/4e/a473079cfdf1776e0d7dc114501860b8ab40c4 @@ -0,0 +1,2 @@ +xM +1 @a=E$IS\1:muw-^Yz Bb1fsckn"!Vq5oIZPɣRkl=ɟq_6MpMW>T~be#>5On\7 \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057 b/test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057 new file mode 100644 index 000000000..1011da458 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/51/c0794d2dfd4eb71cc06f5e894edd3931411057 @@ -0,0 +1,3 @@ +xA + E/hT(U1H +1oJ/XKytPޘyH2\چv=*icبF2w(;R>[&$C$CV,hKm0p;l+_b-7J ΈR:\ePkکB9 \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/5d/7d612ecff0165ff92363cdf90acda30170038e b/test/integration/mergeConflicts/expected/.git_keep/objects/5d/7d612ecff0165ff92363cdf90acda30170038e new file mode 100644 index 0000000000000000000000000000000000000000..7a2dae55fcbc533c947ed6e8fe44e984f4ad8079 GIT binary patch literal 147 zcmV;E0Brww0ga9^3d1lA06Y5?-U~%`Y)gVt3Yqc@#ZqV>X+m(J&u^a4_3nnN+q%xp z2M(8ZnE42lE2)AI7-v(?Y)Qu`BhysM$Oxi{ZkNN}&Bshsk`kgJoi338ajK$Snna^y zNfm*eeA;U}d_VYmKRoR#>%Q2nZtKH`60i#~cG+J;0B|Qgr<(nlyJ=p`{QwQzIOTKq BMa=*J literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/65/73f823441ea560245f56e735d7cbc972607341 b/test/integration/mergeConflicts/expected/.git_keep/objects/65/73f823441ea560245f56e735d7cbc972607341 deleted file mode 100644 index f18991959..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/65/73f823441ea560245f56e735d7cbc972607341 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]d&Ic`Rx| ^=xM}KtVUQU%hMXy)I$*1W0q;!..c]BT8~mB?iy詶r"DfԦ橵 o}|+@ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/65/9aa732ccda1aaa1cd6564fdb93bf0445b5115a b/test/integration/mergeConflicts/expected/.git_keep/objects/65/9aa732ccda1aaa1cd6564fdb93bf0445b5115a deleted file mode 100644 index de26c3c61be71091e0b1402a175f453dd09f3936..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gaAJ3c@fDKwak)*$a}%f1rraRgW>5Oi(bk)CeBm9>MM7J$StK{umn2 zoW?GqZ9?w>h*C+ec;A9^t>kFA7ObUJa2zUHwb3rGp>xQlW;D4#X&h?;Od!c+u+kbq z;FyJ*Q}h}4b=UKvr+K-_m-_aU3$OjEAsWCVK&Q_D#;AiHQ$zmL6}_wa0shH30at=a ASO5S3 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 b/test/integration/mergeConflicts/expected/.git_keep/objects/66/9e34b018f5e04940e15bd9d62465c716932039 new file mode 100644 index 0000000000000000000000000000000000000000..3d485ea3a25f651e4034101974d2338853d0c4e2 GIT binary patch literal 202 zcmV;*05$)30gcbQN(4a=g<<1)ipn++q^fV#1tP*m8~6;;muh!mXL@K_@$nrHbJO#G z$titZZxamrhdERsxzNoS6DgzP#!9P{<=~U7AtkQR=UeatUWXYb*HTsk z?D1qx1SAmA%v}nRXz4SOCRUj8w_q?dFfcPQQAo~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?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6u=7mZ@!~`3dsZ$hR5q-a$DG67*x+bUa7pV;v}O(e;$$oQ-(I?&87BC X?2Cks3wB-;^|`(v-#!Td2lMPcx*E_% literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 b/test/integration/mergeConflicts/expected/.git_keep/objects/78/d8f05867a79068cf661a3654e1e221f6fdc5d8 new file mode 100644 index 0000000000000000000000000000000000000000..48a86e556e97bbe8b2159a8e7ddaae833de2c1d0 GIT binary patch literal 160 zcmV;R0AK%j0gaA93IZ_@1U=^!a~EVYiIZIr5j^>f$!rG&<4TO6zgO@BUW+OyTWY;@ zVjot$0mLxF>?asv36E*Pu-PEdvy9$R2m-V OsyBK=oBIIAwL@;>lt@_s literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a b/test/integration/mergeConflicts/expected/.git_keep/objects/7e/28009fced47639d5a8b45ec229bcfcc265066a new file mode 100644 index 0000000000000000000000000000000000000000..aa7368f7408a3ebc94b9fa6b8ca9b8b470559136 GIT binary patch literal 153 zcmV;K0A~Mq0gaAJ3c@fH0A1%4Z!bt*lI8;M%sOlbDTß{9 \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 b/test/integration/mergeConflicts/expected/.git_keep/objects/86/03b3753f0207a212c71189d6154cd7a06f3f62 new file mode 100644 index 0000000000000000000000000000000000000000..099aa42504bbf873600722f248a364acd932ad32 GIT binary patch literal 57 zcmV-90LK4#0ZYosPf{>9V93u)PE{x^$j?(qR4B>JO;sq#NG(cLC{HW~3S{IL6{m9H PRg#-u3RD6B73mtgjr|q5 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 b/test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 new file mode 100644 index 000000000..552afabd3 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/91/19187695a5b19287b68b0732f9142eee7dc221 @@ -0,0 +1,3 @@ +xM +0F]$i@DL&`l</G{[-ݩ7fS +dVFQDo1[q!)%3&R SQ(MI֕^w_y' W(bϹ2,(_t@ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e b/test/integration/mergeConflicts/expected/.git_keep/objects/91/65a12a95d3b2b9b8a0374de787af169b2c339e new file mode 100644 index 0000000000000000000000000000000000000000..cc06d0590978660f5149a6fcf11e250e95751d16 GIT binary patch literal 48 zcmV-00MGw;0ZYosPf{?kWUzq%1rJw87p{`j;u2#nTL=L2jJWI|Kp`cyEHx*;fC~V! G*$;-xq7tM4 literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 b/test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 new file mode 100644 index 000000000..1c96a4134 --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/9a/415e7414f26bbb93a9369576b6135e29bc7391 @@ -0,0 +1,4 @@ +xA +1 E] 409F3(ة<^_[pW3K*d"rئ/3됆{ՖA2s +IHC}\~[[a4N|A[= E&y=v۟{ + 5}2?o \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 b/test/integration/mergeConflicts/expected/.git_keep/objects/9f/e32ee7a110dbab694c978f1b03fa45f7cd7db6 new file mode 100644 index 0000000000000000000000000000000000000000..288d569425a563ee8e09949f37b1a89fd777c46d GIT binary patch literal 163 zcmV;U09^lg0gaA93c@fD06pgwdlw{|Zn6o82%h?kZL&eZ+R{eU-&^nlUWXZ&JdNY6 zfkWQ4MHP@qVopSqtFW~py250ADyd2u)H5YVE}K~veKg=$VzoX77EYU;YX~S^@T92D zVGXrpU!sv`yG{#SdN^MCv%Y1V?|R77cmfQ_9Xi($>=CUs8{MXw{;8W)^Yke2%V2#D RFZqB M2j- g&s*ۣ0Np|R^rZn@)LO5Wp]giPW(FQ? \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/a4/6fe3d80027b2887996ba65853fb0591915d051 b/test/integration/mergeConflicts/expected/.git_keep/objects/a4/6fe3d80027b2887996ba65853fb0591915d051 new file mode 100644 index 0000000000000000000000000000000000000000..a5cc1d5b4f08333feb5b4e869a152714f04dd8fd GIT binary patch literal 429 zcmV;e0aE^W0V^p=O;s>8w_q?dFfcPQQAo~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?!GzLRGKkJe97EXT%V&AF^Toj-S_73x)|R{IBUZ7&FzcwhOCjy!uuvtMDu~m6i-j8~!%bUVWl*=!V3)Z;K3N zYXo1kniv3qLP};)YH~?_Q6qBoKyxCfpcM{faM3OgTxO3SfpnBo0{*=m{H&bpcX4>?7E-WxW1{gC)&wBdx z{x`#2t0cG#*590A-+V{?6p{%h43F2vT`WTzI_q^9KY;JjWyBG literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/b2/6567e4fd73c518dd6531825d81a389fa49fe03 b/test/integration/mergeConflicts/expected/.git_keep/objects/b2/6567e4fd73c518dd6531825d81a389fa49fe03 deleted file mode 100644 index daaee902370c1903bae8d39fcec8f847a8d144c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0gaA93c@fDMP26<*$Xn0q{#$CgsyswX*wZ-v86`n@eOzZxBtBdKdrSs znl|80Z5PoAmj#`7!Lwr^zX#c$ZfXjb)QKXMmUzIx}aEol}h7 zau^Z;I3ZU2X=UB@IO*#+-R0oAJ>` \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 b/test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 deleted file mode 100644 index 7b80aff0d..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/bf/e07eeabbfcde2e7d6856918dd494c703864b20 +++ /dev/null @@ -1,4 +0,0 @@ -xK -0@]d&i~ "t1&Ʉ -ƖEoo }/ϭ];ht@Ak<&$RSHKѨWwHYeśl)⬡m &CFO -,onMyn' 鈰'BTݦ ~|' > \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 b/test/integration/mergeConflicts/expected/.git_keep/objects/c2/1e6aeba03d5176c28b213be71d3a02e4966c87 new file mode 100644 index 0000000000000000000000000000000000000000..518fc597733799a4153d852629eb564c0227a2f7 GIT binary patch literal 157 zcmV;O0Al}m0gaA93c@fD06pgwdlw{|jY$L%p{G70+1;REn^L3rd<%ZS>o5buZJO>K z9OAC8s!)ZHHAl52Xc8jtk}XPJN)kzdMKW0%&5~E0JFwaiz4usxC^05mJy)z1S!zJ8 zNn*~YWb&)u+6u!6=V83+Cr`^m58S2;V8BS|935egXsy}kHr4e{-8_}sEbz;q%^>>L LM_bGn(-uM)_-IH! literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d b/test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d new file mode 100644 index 000000000..161eb926a --- /dev/null +++ b/test/integration/mergeConflicts/expected/.git_keep/objects/c2/8b32178002cb0046454f34e77f3d86391e748d @@ -0,0 +1,2 @@ +xK +0a95 ]d#?o27/ŐƎQXeEF QGLU!kX&tªST'U-\HNLi;Oeˍ<:#\5g=ɍoj~< \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 b/test/integration/mergeConflicts/expected/.git_keep/objects/ce/0674441b6de3c180f4cf1ff1cdf61cf8d7aa98 new file mode 100644 index 0000000000000000000000000000000000000000..dfd30d88929a240366b9873581e535a7fc46ed5a GIT binary patch literal 159 zcmV;Q0AT-k0gaA93c@fD06pgwdlzJrY?2m4gr540bhE)i+msl^=UeatUWXYNF6%ls zFd9#-ihv=X19d^L6K^dtPr`)GNRSZ$0YIBSil4th*A`BPVUuFnR)3d#ma N-m;WkeF0b}Kkp+9NvQw; literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 b/test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 deleted file mode 100644 index 6955a6f9c..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/d0/9f332ddbdbb1d516ca99da33b23f987e4c13c3 +++ /dev/null @@ -1,4 +0,0 @@ -xM -0a9@DǘZ0߂p>ֵtM4%84D]DO6\MXgLC> N -c -.bƚ5F]>\\Vo@)E L8\em3lO:-?/ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a b/test/integration/mergeConflicts/expected/.git_keep/objects/dc/51702c869f97b9ae4e236dc7684c55816fd99a deleted file mode 100644 index 4cf8403952e666ce7648bd4e341cc6c34910f67b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWft0ZYosPg1ZnWw3z&1rJw87p}b2a-*2M{G!bC%)G=LB&IQ!Ed+p+7~)W3 X2LTF6iN&e$Nkxfy$r)S#lwToO&X63b diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e b/test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e deleted file mode 100644 index a80770449..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/de/8c7134958792e1bff9b33cca090287def37f7e +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]d&i@DH)-M Q</Tmi /@p!s$̑))HlGьv2XeoZ \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc b/test/integration/mergeConflicts/expected/.git_keep/objects/e0/0ef3be7687b4a13bf23199fe9c01767e9b98bc new file mode 100644 index 0000000000000000000000000000000000000000..e8895a84c6443e3cb9440b367ab859f33f7d0c40 GIT binary patch literal 146 zcmV;D0B!$x0gaAJ3c@fDKwak)*$Xn0$;W_*&{dBy$xKi%w$un7-yXs3<2`tF>HRS* zW;l#Z)w-0uM`TVVQSrV7qE^n)RVi6Y6Qmj>JG1hpuVI5EiRiSp1{gzY*-@k_Edy6! z0!#pOR>PlhUp70<_A<>k{c>NQda6smT8x+o-5%N_B7oWHJ~i}D-SAt?4-)`61Pv5I A4*&oF literal 0 HcmV?d00001 diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f b/test/integration/mergeConflicts/expected/.git_keep/objects/e2/17a1e8fe2e038fdc59202dee120f081ecf458f deleted file mode 100644 index 3ed017b564ff7c07c9cccf1691360ebfef603e79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0gaA93d0}}0DJZodoL7M6BD77LQZ+cx~`;9Yp@3T{0jX*ufq%smz*CB z4C+&>B47ue26QNryqgpI5jo+cNh2njDI|$8a8x^0c{PaICu>b-F$9bwIwtQUSsRQ^ zex77tv}_d}Z7UU)6|T#Amk;IrDHksJ2Iw^U8I9L)M$}q$+NYZQsjF0u+BW!QP+pMf L-D~v)k-:/x<ۗlw{ж=&zD >X3]v]^ hjM߻V \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec b/test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec deleted file mode 100644 index e829884f3..000000000 --- a/test/integration/mergeConflicts/expected/.git_keep/objects/f5/794ed7a2233f8a01fea032de77d2bc6a02aaec +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]d2&M"BW=$P~{Xހ;*7)9'x2U "gr琳dg̒R"m,ٽxkS0pƛy^reP^G8ju?O\3Ou /p\eP9B \ No newline at end of file diff --git a/test/integration/mergeConflicts/expected/.git_keep/objects/fd/64b741be226a9fe125acf45a438c089a845fea b/test/integration/mergeConflicts/expected/.git_keep/objects/fd/64b741be226a9fe125acf45a438c089a845fea new file mode 100644 index 0000000000000000000000000000000000000000..422081a4d12ff2889753c4862e43d0dc996cf3bb GIT binary patch literal 155 zcmV;M0A&Ao0gaAL3c@fDMqTF=vlk>YN%I3DLRUS;B$-m7H6^6r@hx}(S06mygD=-@ zdvzc^TzV6M!k*Zb;^xH6mMLh%CI{!O@tguOa*V9i&Q0DOB4WhgT^x8w7%BMVLek#Q z9MO`9_>zfG@zIysV4UDSPEYypwy$!_b$b9h^ahEHg)5@g>ZIqXE`RE3u1D(&{IYZE Js=iHOJ{7G