diff --git a/asdfasdfasdf b/asdfasdfasdf index feb605c..66f65f8 100644 --- a/asdfasdfasdf +++ b/asdfasdfasdf @@ -10,4 +10,817 @@ asdf asdfasdfasdfs -ASJKDNFAKNDSNSDKFASDFNSDKN \ No newline at end of file +ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + +SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + +asdfasdf +as +df +asd +fa +sdf +asdf +asdfasdfasdfs + + +ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKNSFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN + + + SFDASDFASDFASDFSDsfasdgfasfgasdfasdfasdf + + asdfasdf + as + df + asd + fa + sdf + asdf + asdfasdfasdfs + + + ASJKDNFAKNDSNSDKFASDFNSDKN \ No newline at end of file diff --git a/asdfsdfsdf.sh b/asdfsdfsdf.sh index ba7764f..39d77be 100644 --- a/asdfsdfsdf.sh +++ b/asdfsdfsdf.sh @@ -412,32 +412,6 @@ adsfasdfasdf asdasdasdasd -adsfasdfasdf - - - -234234234234#!/usr/bin/env bash -фывфыв - - -asdasdasdasd - - -adsfasdfasdf - - - -234234234234#!/usr/bin/env bash -фывфыв - - -asdasdasdasd - - -adsfasdfasdf - - - 234234234234#!/usr/bin/env bash фывфыв @@ -469,8 +443,6 @@ asdasdasdasd adsfasdfasdf - - 234234234234#!/usr/bin/env bash фывфыв diff --git a/test-conflict b/test-conflict index 79c568e..12366bb 100644 --- a/test-conflict +++ b/test-conflict @@ -12,4 +12,249 @@ asfasdfasdf -asdfasdfasdfasdfasdf \ No newline at end of file +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + + +1 line +2 line in master +3 line in master +4 +5 +6 +7 +8 +9 +10 + + +asfasdfasdf + +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + + +1 line +2 line in master +3 line in master +4 +5 +6 +7 +8 +9 +10 + + +asfasdfasdf + +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + + +1 line +2 line in master +3 line in master +4 +5 +6 +7 +8 +9 +10 + + +asfasdfasdf + +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + + +1 line +2 line in master +3 line in master +4 +5 +6 +7 +8 +9 +10 + + +asfasdfasdf + +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + + +1 line +2 line in master +3 line in master +4 +5 +6 +7 +8 +9 +10 + + +asfasdfasdf + +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + + +1 line +2 line in master +3 line in master +4 +5 +6 +7 +8 +9 +10 + + +asfasdfasdf + +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + + +1 line +2 line in master +3 line in master +4 +5 +6 +7 +8 +9 +10 + + +asfasdfasdf + +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + + +1 line +2 line in master +3 line in master +4 +5 +6 +7 +8 +9 +10 + + +asfasdfasdf + +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + + +1 line +2 line in master +3 line in master +4 +5 +6 +7 +8 +9 +10 + + +asfasdfasdf + +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + + +1 line +2 line in master +3 line in master +4 +5 +6 +7 +8 +9 +10 + + +asfasdfasdf + +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + + +1 line +2 line in master +3 line in master +4 +5 +6 +7 +8 +9 +10 + + +asfasdfasdf + +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + + +1 line +2 line in master +3 line in master +4 +5 +6 +7 +8 +9 +10 + + +asfasdfasdf + +asdfasdfasdfasdfasdf + + +фывфаОЫВтафыва + +