From 9dec8e91fee534c84dc00f69f7e93ba048176640 Mon Sep 17 00:00:00 2001 From: "Artem.Rokhin" Date: Wed, 21 Aug 2019 16:05:54 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D1=84=D0=B2=D1=8B=D0=B0?= =?UTF-8?q?=D1=84=D1=8B=D0=B2=D0=B0=D1=84=D1=8B=D0=B2=D0=B0=D1=84=D1=8B?= =?UTF-8?q?=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asdfasdfasdf | 815 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 814 insertions(+), 1 deletion(-) 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 From b886c68ed6d23835515efbf5d9a23d643a89521c Mon Sep 17 00:00:00 2001 From: "Artem.Rokhin" Date: Wed, 21 Aug 2019 16:06:35 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D1=84=D0=B0=D1=84=D1=8B=D0=B2=D0=B0=D1=84?= =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D1=84=D1=8B=D0=B2=D0=B0=D1=8B=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asdfsdfsdf.sh | 28 ------ test-conflict | 247 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 246 insertions(+), 29 deletions(-) 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 + + +фывфаОЫВтафыва + +