From e4679d30e388b446dd33b8af875abc1a86978d4d Mon Sep 17 00:00:00 2001
From: mkaoj697q <1878447768@qq.com>
Date: Wed, 20 Nov 2024 15:38:35 +0800
Subject: [PATCH 1/7] Delete '1 .txt'

---
 1 .txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 1 .txt

diff --git a/1 .txt b/1 .txt
deleted file mode 100644
index 9d07aa0d..00000000
--- a/1 .txt	
+++ /dev/null
@@ -1 +0,0 @@
-111
\ No newline at end of file

From b6c22832770fe34114d7d37794f4960587a41b73 Mon Sep 17 00:00:00 2001
From: "14879940+orange-jam-1@user.noreply.gitee.com" <1878447768@qq.com>
Date: Wed, 20 Nov 2024 18:52:08 +0800
Subject: [PATCH 2/7] 1

---
 1 .txt | 1 -
 1.txt  | 1 +
 2.txt  | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 1 .txt
 create mode 100644 1.txt
 create mode 100644 2.txt

diff --git a/1 .txt b/1 .txt
deleted file mode 100644
index 9d07aa0d..00000000
--- a/1 .txt	
+++ /dev/null
@@ -1 +0,0 @@
-111
\ No newline at end of file
diff --git a/1.txt b/1.txt
new file mode 100644
index 00000000..d1d06ad3
--- /dev/null
+++ b/1.txt
@@ -0,0 +1 @@
+1111
\ No newline at end of file
diff --git a/2.txt b/2.txt
new file mode 100644
index 00000000..6dd90d24
--- /dev/null
+++ b/2.txt
@@ -0,0 +1 @@
+222
\ No newline at end of file

From b457c59a3a78f56ab6790cf2aa0f4823ff90605f Mon Sep 17 00:00:00 2001
From: "14879940+orange-jam-1@user.noreply.gitee.com" <1878447768@qq.com>
Date: Wed, 20 Nov 2024 18:57:08 +0800
Subject: [PATCH 3/7] 1

---
 1.txt | 3 ++-
 2.txt | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/1.txt b/1.txt
index d1d06ad3..1d92bfe6 100644
--- a/1.txt
+++ b/1.txt
@@ -1 +1,2 @@
-1111
\ No newline at end of file
+1111
+2222
\ No newline at end of file
diff --git a/2.txt b/2.txt
index 6dd90d24..f89c18fd 100644
--- a/2.txt
+++ b/2.txt
@@ -1 +1,2 @@
-222
\ No newline at end of file
+222
+333
\ No newline at end of file

From a81434a0e3fb9b6be6deb48edf98fb2af989aae4 Mon Sep 17 00:00:00 2001
From: "14879940+orange-jam-1@user.noreply.gitee.com" <1878447768@qq.com>
Date: Wed, 20 Nov 2024 20:04:43 +0800
Subject: [PATCH 4/7] 1

---
 main.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 main.txt

diff --git a/main.txt b/main.txt
new file mode 100644
index 00000000..0f631382
--- /dev/null
+++ b/main.txt
@@ -0,0 +1 @@
+branch 2中修改main.txt
\ No newline at end of file

From c6c427d8680c467545ef7038600e33b017878f5a Mon Sep 17 00:00:00 2001
From: mkaoj697q <1878447768@qq.com>
Date: Wed, 20 Nov 2024 20:07:07 +0800
Subject: [PATCH 5/7] Delete '1.txt'

---
 1.txt | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 1.txt

diff --git a/1.txt b/1.txt
deleted file mode 100644
index 1d92bfe6..00000000
--- a/1.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-1111
-2222
\ No newline at end of file

From 4335bc0ac7c167cc78991f784a46cc7c00dcf828 Mon Sep 17 00:00:00 2001
From: mkaoj697q <1878447768@qq.com>
Date: Wed, 20 Nov 2024 20:07:13 +0800
Subject: [PATCH 6/7] Delete '2.txt'

---
 2.txt | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 2.txt

diff --git a/2.txt b/2.txt
deleted file mode 100644
index f89c18fd..00000000
--- a/2.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-222
-333
\ No newline at end of file

From 8aeb7f9a1b97dbc5f80826b384291acdc92284a8 Mon Sep 17 00:00:00 2001
From: mkaoj697q <1878447768@qq.com>
Date: Wed, 20 Nov 2024 20:07:19 +0800
Subject: [PATCH 7/7] Delete 'main.txt'

---
 main.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 main.txt

diff --git a/main.txt b/main.txt
deleted file mode 100644
index 0f631382..00000000
--- a/main.txt
+++ /dev/null
@@ -1 +0,0 @@
-branch 2中修改main.txt
\ No newline at end of file