From 006e47a0ed5cb5e18474042fee250647d15b9e61 Mon Sep 17 00:00:00 2001 From: KotovM0971 Date: Tue, 11 Mar 2025 11:00:31 +0300 Subject: [PATCH 01/13] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=201?= =?UTF-8?q?=20=D0=B2=20branch1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- file1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file1.txt diff --git a/file1.txt b/file1.txt new file mode 100644 index 0000000000..4f588bc46d --- /dev/null +++ b/file1.txt @@ -0,0 +1 @@ +Изменение 1 From f60c0454726027f19f7349ec7a25117e1faedefc Mon Sep 17 00:00:00 2001 From: KotovM0971 Date: Tue, 11 Mar 2025 11:02:07 +0300 Subject: [PATCH 02/13] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=202?= =?UTF-8?q?=20=D0=B2=20branch1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- file2.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file2.txt diff --git a/file2.txt b/file2.txt new file mode 100644 index 0000000000..05c7987f49 --- /dev/null +++ b/file2.txt @@ -0,0 +1 @@ +Изменение 2 From 3dc0b90039828f9873f560c3e27495961cc3f0da Mon Sep 17 00:00:00 2001 From: KotovM0971 Date: Tue, 11 Mar 2025 11:02:50 +0300 Subject: [PATCH 03/13] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=203?= =?UTF-8?q?=20=D0=B2=20branch1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- file3.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file3.txt diff --git a/file3.txt b/file3.txt new file mode 100644 index 0000000000..e789dab4a9 --- /dev/null +++ b/file3.txt @@ -0,0 +1 @@ +Изменение 3 From 7cbad7f620ae15d9acca738dbfad9c7432a7e814 Mon Sep 17 00:00:00 2001 From: KotovM0971 Date: Tue, 11 Mar 2025 11:04:27 +0300 Subject: [PATCH 04/13] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=201?= =?UTF-8?q?=20=D0=B2=20branch2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- file1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file1.txt diff --git a/file1.txt b/file1.txt new file mode 100644 index 0000000000..ca11923d02 --- /dev/null +++ b/file1.txt @@ -0,0 +1 @@ +Изменение А From 94ad5c7a63e0ef26954926a3700fe3bcde95b0b3 Mon Sep 17 00:00:00 2001 From: KotovM0971 Date: Tue, 11 Mar 2025 11:05:07 +0300 Subject: [PATCH 05/13] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=202?= =?UTF-8?q?=20=D0=B2=20branch2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- file2.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file2.txt diff --git a/file2.txt b/file2.txt new file mode 100644 index 0000000000..683f6f047e --- /dev/null +++ b/file2.txt @@ -0,0 +1 @@ +Изменение B From a97c8d4b3b6e7734e28841b901525872d7fcd768 Mon Sep 17 00:00:00 2001 From: KotovM0971 Date: Tue, 11 Mar 2025 11:05:51 +0300 Subject: [PATCH 06/13] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=203?= =?UTF-8?q?=20=D0=B2=20branch2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- file3.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file3.txt diff --git a/file3.txt b/file3.txt new file mode 100644 index 0000000000..33b502f357 --- /dev/null +++ b/file3.txt @@ -0,0 +1 @@ +Изменение С From 1c3548e3c1b98e9b5488d8269d9b18969f89b5bd Mon Sep 17 00:00:00 2001 From: KotovM0971 Date: Tue, 11 Mar 2025 11:38:25 +0300 Subject: [PATCH 07/13] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .file2.txt.swp | Bin 0 -> 12288 bytes .file2_LOCAL_2638.txt.swp | Bin 0 -> 12288 bytes .file2_REMOTE_2638.txt.swp | Bin 0 -> 12288 bytes file2_BACKUP_2638.txt | 1 + file2_BASE_2638.txt | 0 file2_LOCAL_2638.txt | 1 + file2_REMOTE_2638.txt | 1 + test.txt | 0 8 files changed, 3 insertions(+) create mode 100644 .file2.txt.swp create mode 100644 .file2_LOCAL_2638.txt.swp create mode 100644 .file2_REMOTE_2638.txt.swp create mode 100644 file2_BACKUP_2638.txt create mode 100644 file2_BASE_2638.txt create mode 100644 file2_LOCAL_2638.txt create mode 100644 file2_REMOTE_2638.txt create mode 100644 test.txt diff --git a/.file2.txt.swp b/.file2.txt.swp new file mode 100644 index 0000000000000000000000000000000000000000..9475c57c4743dd68b2a98691b358ebe1d5038720 GIT binary patch literal 12288 zcmeI%&q@M89Ki9PT}29gfvwIu?n*-UEs+ra=6$o2l@PHZqDxQUy%!NZ=p)F^bJ(#L zXea9Cdh)XH{lPHIzaPK(+=h85_v;Pky5ve6XCnT0G@5U-qOu~L;Jq@b+J(d6-*oSK z%~r8?>vr2$e&S{|P_JvvULj2q1s}0tg_000IagfB*srq)EVhnx$Erh1vYJ Jm038R`~a1VEMNct literal 0 HcmV?d00001 diff --git a/.file2_LOCAL_2638.txt.swp b/.file2_LOCAL_2638.txt.swp new file mode 100644 index 0000000000000000000000000000000000000000..43a9a828d744cbfae573eedd42f477908b6195c2 GIT binary patch literal 12288 zcmeI%&q@M89Ki9PT_uWqfvwIt?k-9lt1XcXOU;>8p125af)57-$!!Un-!*4#fVQvep%B6FZcO{N(k>F?cIGkohWku@Yo8K+jh5sWs zYg{yIR|n;Dw{cwz5;v=kDo5H=PvJ{A==7tWRu9qhz1ObRPLHc?ujC)*^{Y*TBkys|8_T*g34O}0MY#wd zfB*srAb#L-YUg2S45GPwy@KmdU? z1U4nme%&S5+uiZ1mHryJIEnxQ2q1s}0tg_000Ko5FyoR;v!XYC3oqsLMY|XEB7gt_ z2q1s}0tg_000IagfWV(Xav`$V68XxS`~P3P|K0f0%@GJ7fB*srAb Date: Tue, 11 Mar 2025 11:40:36 +0300 Subject: [PATCH 08/13] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test1.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test1.txt diff --git a/test1.txt b/test1.txt new file mode 100644 index 0000000000..e69de29bb2 From d04f9cc67dcdf2546b055684f263d1c383776b0a Mon Sep 17 00:00:00 2001 From: KotovM0971 Date: Tue, 11 Mar 2025 11:41:19 +0300 Subject: [PATCH 09/13] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test1.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test1.txt b/test1.txt index e69de29bb2..059d68854c 100644 --- a/test1.txt +++ b/test1.txt @@ -0,0 +1,2 @@ +kjubhgrkjotre + From f9515199bf7c577d76d4ad28ed92ee7ecaad2a43 Mon Sep 17 00:00:00 2001 From: KotovM0971 Date: Tue, 11 Mar 2025 11:42:30 +0300 Subject: [PATCH 10/13] =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test1.txt b/test1.txt index 059d68854c..28c55466f9 100644 --- a/test1.txt +++ b/test1.txt @@ -1,2 +1,2 @@ -kjubhgrkjotre +jgfjfgkjubhgrkjotre From da885b5a25e23fdea0983f801d185ed33c7a781c Mon Sep 17 00:00:00 2001 From: KotovM0971 Date: Tue, 11 Mar 2025 11:51:57 +0300 Subject: [PATCH 11/13] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test2.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test2.txt diff --git a/test2.txt b/test2.txt new file mode 100644 index 0000000000..e69de29bb2 From b4e36a879ffce382b89677162985b7178549db5f Mon Sep 17 00:00:00 2001 From: KotovM0971 Date: Tue, 11 Mar 2025 11:52:28 +0300 Subject: [PATCH 12/13] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test2.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test2.txt b/test2.txt index e69de29bb2..190a18037c 100644 --- a/test2.txt +++ b/test2.txt @@ -0,0 +1 @@ +123 From a08f16aeb3ac62bcf6e6083d2e341e2b0273b3f2 Mon Sep 17 00:00:00 2001 From: KotovM0971 Date: Tue, 11 Mar 2025 11:52:53 +0300 Subject: [PATCH 13/13] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test2.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test2.txt b/test2.txt index 190a18037c..e459bc8716 100644 --- a/test2.txt +++ b/test2.txt @@ -1 +1 @@ -123 +345123