From f1318e692ad1f16468e6609088818eb8fd346bbb Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Thu, 16 Jan 2025 11:55:42 +0800
Subject: [PATCH 01/38] =?UTF-8?q?dev=20=E5=88=86=E6=94=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8a.txt=E4=B8=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E8=A1=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 a.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/a.txt b/a.txt
index b1834f2..6105bd6 100644
--- a/a.txt
+++ b/a.txt
@@ -5,3 +5,6 @@ add one
 手动做了merge操作，将dev和master分支做和合并操作，上面所合并后端结果。
 add by dev branch
 哈哈哈哈哈
+
+
+dev 分支新增加的

From 93a8a714982ee89caeeb0951da46abd12e329930 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Thu, 16 Jan 2025 13:35:57 +0800
Subject: [PATCH 02/38] add by dev one

---
 a.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/a.txt b/a.txt
index 6105bd6..22ebb64 100644
--- a/a.txt
+++ b/a.txt
@@ -8,3 +8,4 @@ add by dev branch
 
 
 dev 分支新增加的
+add by dev one

From e9516c12d5f8709b65562009fdcac1b8c46e78b6 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Thu, 16 Jan 2025 13:40:33 +0800
Subject: [PATCH 03/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 a.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/a.txt b/a.txt
index 22ebb64..958618b 100644
--- a/a.txt
+++ b/a.txt
@@ -2,10 +2,10 @@ dddddd
 add one
 添加a.txt文件之后，xxxfffdddd在dev分支又修改了改文件，增加了这一样。
 这是在master分支上面增加的内容，添加在了a.txt的第三行中。
-手动做了merge操作，将dev和master分支做和合并操作，上面所合并后端结果。
 add by dev branch
-哈哈哈哈哈
+哈哈哈哈哈dd
 
 
 dev 分支新增加的
 add by dev one
+add by dev two

From 86726be2aee5cfea548800ec145af1519b676329 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Thu, 16 Jan 2025 13:53:13 +0800
Subject: [PATCH 04/38] =?UTF-8?q?add=20dev=E6=B7=BB=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E8=A1=8C=E3=80=82=E3=80=82=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 a.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/a.txt b/a.txt
index 958618b..f8a6847 100644
--- a/a.txt
+++ b/a.txt
@@ -9,3 +9,9 @@ add by dev branch
 dev 分支新增加的
 add by dev one
 add by dev two
+
+
+____________
+add by dev ......
+
+

From 3b73dc2380230451624438f409f804564914f41a Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Thu, 16 Jan 2025 14:01:51 +0800
Subject: [PATCH 05/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86AAAAA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 a.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/a.txt b/a.txt
index f8a6847..a06f0fc 100644
--- a/a.txt
+++ b/a.txt
@@ -14,4 +14,4 @@ add by dev two
 ____________
 add by dev ......
 
-
+添加AAAAA

From 84f0cb740532852215e36e49c69ea1daf6e3f34e Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Thu, 16 Jan 2025 14:06:36 +0800
Subject: [PATCH 06/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0bbbbbbbb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 a.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/a.txt b/a.txt
index f8a6847..3df82f8 100644
--- a/a.txt
+++ b/a.txt
@@ -14,4 +14,5 @@ add by dev two
 ____________
 add by dev ......
 
-
+添加AAAAA
+dev题安静bbbbbbb

From a9a71a19fd69d0f42312f09e2e28a66a334d070c Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 10:31:04 +0800
Subject: [PATCH 07/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9a=20c=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 a.txt | 3 +++
 c.txt | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/a.txt b/a.txt
index 3df82f8..3588d0a 100644
--- a/a.txt
+++ b/a.txt
@@ -16,3 +16,6 @@ add by dev ......
 
 添加AAAAA
 dev题安静bbbbbbb
+
+
+diev
diff --git a/c.txt b/c.txt
index e74329b..9774bbe 100644
--- a/c.txt
+++ b/c.txt
@@ -1,5 +1,3 @@
 aa
-dd
-bb
-aaaa
-
+dffdsfd
+d

From 30e4bc114db7285e942e17d01dde2051a45d3b40 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 10:36:46 +0800
Subject: [PATCH 08/38] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86c=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/c.txt b/c.txt
deleted file mode 100644
index 9774bbe..0000000
--- a/c.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-aa
-dffdsfd
-d

From 6da96320cb118f080a8e66a60edea6a0783c3eeb Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 10:37:46 +0800
Subject: [PATCH 09/38] =?UTF-8?q?=E5=88=A0=E9=99=A4a.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/a.txt b/a.txt
deleted file mode 100644
index 3588d0a..0000000
--- a/a.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-dddddd
-add one
-添加a.txt文件之后，xxxfffdddd在dev分支又修改了改文件，增加了这一样。
-这是在master分支上面增加的内容，添加在了a.txt的第三行中。
-add by dev branch
-哈哈哈哈哈dd
-
-
-dev 分支新增加的
-add by dev one
-add by dev two
-
-
-____________
-add by dev ......
-
-添加AAAAA
-dev题安静bbbbbbb
-
-
-diev

From 3afdb71f2fcb5de323b90a51bb93611406d95aa5 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 10:37:46 +0800
Subject: [PATCH 10/38] =?UTF-8?q?=E5=88=A0=E9=99=A4a.txt=EF=BC=8C=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8git=20commit=20--amend=E5=91=BD=E4=BB=A4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=86=E8=BF=99=E4=B8=AA=E6=B3=A8=E8=A7=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/a.txt b/a.txt
deleted file mode 100644
index 3588d0a..0000000
--- a/a.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-dddddd
-add one
-添加a.txt文件之后，xxxfffdddd在dev分支又修改了改文件，增加了这一样。
-这是在master分支上面增加的内容，添加在了a.txt的第三行中。
-add by dev branch
-哈哈哈哈哈dd
-
-
-dev 分支新增加的
-add by dev one
-add by dev two
-
-
-____________
-add by dev ......
-
-添加AAAAA
-dev题安静bbbbbbb
-
-
-diev

From ef95aa6760f49b2190f01863c1a6c1740b4a5ca2 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 11:23:03 +0800
Subject: [PATCH 11/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0qa.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/qa.txt b/qa.txt
new file mode 100644
index 0000000..de0b030
--- /dev/null
+++ b/qa.txt
@@ -0,0 +1 @@
+qa file

From f5fa9bc9e0c42583558dd57c7e43d6982af7e4b9 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 11:23:03 +0800
Subject: [PATCH 12/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0qa.txt=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8dev=E5=88=86=E6=94=AF=E4=B8=AD=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=9A=84=EF=BC=8C=E5=9C=A8dev=E5=88=86=E6=94=AF=E4=B8=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/qa.txt b/qa.txt
new file mode 100644
index 0000000..de0b030
--- /dev/null
+++ b/qa.txt
@@ -0,0 +1 @@
+qa file

From f7c6d1c14fe5d67b5df21c30c7f336f444d6ed0d Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 11:33:37 +0800
Subject: [PATCH 13/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0temp.txt,=20test.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 temp.txt | 1 +
 test.txt | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 temp.txt
 create mode 100644 test.txt

diff --git a/temp.txt b/temp.txt
new file mode 100644
index 0000000..e61ef7b
--- /dev/null
+++ b/temp.txt
@@ -0,0 +1 @@
+aa
diff --git a/test.txt b/test.txt
new file mode 100644
index 0000000..7898192
--- /dev/null
+++ b/test.txt
@@ -0,0 +1 @@
+a

From a8f3a99768e4d9f324dff5c66e388b46ecf9d75f Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 11:33:37 +0800
Subject: [PATCH 14/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0temp.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 temp.txt | 1 +
 test.txt | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 temp.txt
 create mode 100644 test.txt

diff --git a/temp.txt b/temp.txt
new file mode 100644
index 0000000..e61ef7b
--- /dev/null
+++ b/temp.txt
@@ -0,0 +1 @@
+aa
diff --git a/test.txt b/test.txt
new file mode 100644
index 0000000..7898192
--- /dev/null
+++ b/test.txt
@@ -0,0 +1 @@
+a

From 379032d2eb0609ea6c2f0cf983f3479bb9cfeb84 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 11:44:47 +0800
Subject: [PATCH 15/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 temp.txt | 2 +-
 test.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/temp.txt b/temp.txt
index e61ef7b..a21e7d4 100644
--- a/temp.txt
+++ b/temp.txt
@@ -1 +1 @@
-aa
+iiiiii     aa
diff --git a/test.txt b/test.txt
index 7898192..ea8f022 100644
--- a/test.txt
+++ b/test.txt
@@ -1 +1 @@
-a
+aaaaaaaa

From 316cd40755300072eff6e3be66b2a536cb544dae Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 11:44:47 +0800
Subject: [PATCH 16/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6,=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AAqa.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qa.txt   | 3 +++
 temp.txt | 2 +-
 test.txt | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/qa.txt b/qa.txt
index de0b030..24404a1 100644
--- a/qa.txt
+++ b/qa.txt
@@ -1 +1,4 @@
 qa file
+
+
+aaaa
diff --git a/temp.txt b/temp.txt
index e61ef7b..a21e7d4 100644
--- a/temp.txt
+++ b/temp.txt
@@ -1 +1 @@
-aa
+iiiiii     aa
diff --git a/test.txt b/test.txt
index 7898192..ea8f022 100644
--- a/test.txt
+++ b/test.txt
@@ -1 +1 @@
-a
+aaaaaaaa

From e14f39c7e88528b3ceec092b24b5886f49d8cec1 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 13:23:45 +0800
Subject: [PATCH 17/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A01.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/1.txt b/1.txt
new file mode 100644
index 0000000..e95d026
--- /dev/null
+++ b/1.txt
@@ -0,0 +1 @@
+affff

From ac52782866b78b68934469fc37fae54d99160004 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 13:25:01 +0800
Subject: [PATCH 18/38] =?UTF-8?q?=E4=BF=AE=E6=94=B91.txt,=20temp.txt,=20te?=
 =?UTF-8?q?st.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.txt    | 2 ++
 temp.txt | 1 +
 test.txt | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/1.txt b/1.txt
index e95d026..71a4a78 100644
--- a/1.txt
+++ b/1.txt
@@ -1 +1,3 @@
 affff
+
+1.txt
diff --git a/temp.txt b/temp.txt
index a21e7d4..7345a18 100644
--- a/temp.txt
+++ b/temp.txt
@@ -1 +1,2 @@
 iiiiii     aa
+temp
diff --git a/test.txt b/test.txt
index ea8f022..c618c40 100644
--- a/test.txt
+++ b/test.txt
@@ -1 +1,4 @@
 aaaaaaaa
+
+
+test

From 7ce9a18b7aff42411da3d7f660881ea722acc8db Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 13:25:01 +0800
Subject: [PATCH 19/38] =?UTF-8?q?=E4=BF=AE=E6=94=B91.txt,=20temp.txt,=20te?=
 =?UTF-8?q?st.txt,=E5=8F=88=E9=80=9A=E8=BF=87git=20commit=20--amend?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=86test.txt=E7=9A=84=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/1.txt b/1.txt
index e95d026..71a4a78 100644
--- a/1.txt
+++ b/1.txt
@@ -1 +1,3 @@
 affff
+
+1.txt
diff --git a/temp.txt b/temp.txt
index a21e7d4..7345a18 100644
--- a/temp.txt
+++ b/temp.txt
@@ -1 +1,2 @@
 iiiiii     aa
+temp

From 80db73a17174d03edfd236a671f42d7bd42e0f60 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 13:35:02 +0800
Subject: [PATCH 20/38] =?UTF-8?q?c=E3=80=82txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 c.txt | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 c.txt

diff --git a/c.txt b/c.txt
new file mode 100644
index 0000000..fd9cd4a
--- /dev/null
+++ b/c.txt
@@ -0,0 +1,6 @@
+add by qa branch
+aa
+dd
+bb
+aaaa
+

From bbc496447b46db930076b08cee98c4fd3fd3e565 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 13:36:37 +0800
Subject: [PATCH 21/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9c.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 c.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/c.txt b/c.txt
index fd9cd4a..3063445 100644
--- a/c.txt
+++ b/c.txt
@@ -1,5 +1,3 @@
-add by qa branch
-aa
 dd
 bb
 aaaa

From 8cec18a9c2eaa125da4747f5cf9b2e81df561bea Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 13:38:13 +0800
Subject: [PATCH 22/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9c.txt,=20qa.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 c.txt  | 2 +-
 qa.txt | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/c.txt b/c.txt
index 3063445..ff90fa8 100644
--- a/c.txt
+++ b/c.txt
@@ -1,4 +1,4 @@
 dd
 bb
 aaaa
-
+nj 添加c.txt中的内容
diff --git a/qa.txt b/qa.txt
index 24404a1..822f703 100644
--- a/qa.txt
+++ b/qa.txt
@@ -2,3 +2,6 @@ qa file
 
 
 aaaa
+
+
+dev 增加一行

From b84c0f6e9abb7d8147ae5b88f4db122bb3a9ea86 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 13:38:13 +0800
Subject: [PATCH 23/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9c.txt,=20qa.txt,?=
 =?UTF-8?q?=E5=8F=88=E5=8F=96=E6=B6=88=E4=BA=86c.txt=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E9=80=9A=E8=BF=87git=20commit=20--amend?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=8F=96=E6=B6=88=E7=9A=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qa.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qa.txt b/qa.txt
index 24404a1..822f703 100644
--- a/qa.txt
+++ b/qa.txt
@@ -2,3 +2,6 @@ qa file
 
 
 aaaa
+
+
+dev 增加一行

From 784c3d0a668912018ff62855642d390ac83e1c63 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 13:49:28 +0800
Subject: [PATCH 24/38] =?UTF-8?q?=E4=BF=AE=E6=94=B91=20=E5=92=8C=20c?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/1.txt b/1.txt
index 71a4a78..b4c1ddd 100644
--- a/1.txt
+++ b/1.txt
@@ -1,3 +1,6 @@
 affff
 
 1.txt
+
+
+修改的1.txt
diff --git a/c.txt b/c.txt
index ff90fa8..c21b5b6 100644
--- a/c.txt
+++ b/c.txt
@@ -2,3 +2,4 @@ dd
 bb
 aaaa
 nj 添加c.txt中的内容
+修改了c.txt

From badba00c25f07ffcba3a48593e086ddf45324922 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 13:49:28 +0800
Subject: [PATCH 25/38] =?UTF-8?q?=E4=BF=AE=E6=94=B91=20=E5=92=8C=20c,?=
 =?UTF-8?q?=E5=8F=88=E5=8E=BB=E6=8E=89=E4=BA=861,=E8=83=BD=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=90=97=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 c.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/c.txt b/c.txt
index ff90fa8..c21b5b6 100644
--- a/c.txt
+++ b/c.txt
@@ -2,3 +2,4 @@ dd
 bb
 aaaa
 nj 添加c.txt中的内容
+修改了c.txt

From b7200c7fc02001aab7ba8bf1b90180cbc4f0a121 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 13:56:28 +0800
Subject: [PATCH 26/38] 1.c

---
 1.txt | 4 ++++
 c.txt | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/1.txt b/1.txt
index b4c1ddd..779ef50 100644
--- a/1.txt
+++ b/1.txt
@@ -4,3 +4,7 @@ affff
 
 
 修改的1.txt
+
+
+
+xxxxxxxyyyyyyzzzzz
diff --git a/c.txt b/c.txt
index c21b5b6..4a65a88 100644
--- a/c.txt
+++ b/c.txt
@@ -3,3 +3,5 @@ bb
 aaaa
 nj 添加c.txt中的内容
 修改了c.txt
+
+2111111111111

From fbb9db9d538773119ae339b8a7bb2e1c73412b7b Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 16:49:36 +0800
Subject: [PATCH 27/38] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=A9=E4=B8=AA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.txt | 6 ++++++
 c.txt | 1 +
 2 files changed, 7 insertions(+)

diff --git a/1.txt b/1.txt
index 71a4a78..08d4184 100644
--- a/1.txt
+++ b/1.txt
@@ -1,3 +1,9 @@
 affff
 
 1.txt
+
+
+
+feng
+feng
+feng
diff --git a/c.txt b/c.txt
index c21b5b6..a11952c 100644
--- a/c.txt
+++ b/c.txt
@@ -1,4 +1,5 @@
 dd
+iiiiiiiiiiiiiiiiiii
 bb
 aaaa
 nj 添加c.txt中的内容

From baf67e973c3a6ca8f947eda2bb4fa0ae053f030f Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 16:53:53 +0800
Subject: [PATCH 28/38] xiugai 1.txt c.txt

---
 1.txt | 5 -----
 c.txt | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/1.txt b/1.txt
index 4ccb5d5..0f1a6f4 100644
--- a/1.txt
+++ b/1.txt
@@ -1,8 +1,3 @@
-affff
-
-1.txt
-
-
 
 feng
 feng
diff --git a/c.txt b/c.txt
index 73f3b28..3060340 100644
--- a/c.txt
+++ b/c.txt
@@ -1,7 +1,3 @@
-dd
-iiiiiiiiiiiiiiiiiii
-bb
-aaaa
 nj 添加c.txt中的内容
 修改了c.txt
 

From b8d4e802e2dfb97e8b698e9cb07b6847d6ef3be3 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 17:03:08 +0800
Subject: [PATCH 29/38] dddd

---
 1.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/1.txt b/1.txt
index 0f1a6f4..4ccb5d5 100644
--- a/1.txt
+++ b/1.txt
@@ -1,3 +1,8 @@
+affff
+
+1.txt
+
+
 
 feng
 feng

From ae139f6d6b08b60b83553fb2a65a8d46d8ebc23f Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 17:04:31 +0800
Subject: [PATCH 30/38] abcabcabc

---
 1.txt | 2 +-
 c.txt | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/1.txt b/1.txt
index 4ccb5d5..1dd5e60 100644
--- a/1.txt
+++ b/1.txt
@@ -1,4 +1,4 @@
-affff
+aaaaaaffff
 
 1.txt
 
diff --git a/c.txt b/c.txt
index 3060340..687c65c 100644
--- a/c.txt
+++ b/c.txt
@@ -1,4 +1,2 @@
-nj 添加c.txt中的内容
-修改了c.txt
 
 2111111111111

From 16173d546774f2fa183a449f7b8a39626ffbd69b Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 17:06:21 +0800
Subject: [PATCH 31/38] 888888888

---
 1.txt | 2 +-
 c.txt | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/1.txt b/1.txt
index 4ccb5d5..1dd5e60 100644
--- a/1.txt
+++ b/1.txt
@@ -1,4 +1,4 @@
-affff
+aaaaaaffff
 
 1.txt
 
diff --git a/c.txt b/c.txt
index 3060340..687c65c 100644
--- a/c.txt
+++ b/c.txt
@@ -1,4 +1,2 @@
-nj 添加c.txt中的内容
-修改了c.txt
 
 2111111111111

From 3ea7fdc704634ee6543a4d199f9920cc1623a08b Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 18:25:20 +0800
Subject: [PATCH 32/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0a.txt=20b.txt=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/a.txt b/a.txt
new file mode 100644
index 0000000..d83a8d7
--- /dev/null
+++ b/a.txt
@@ -0,0 +1,2 @@
+aaaaaa
+
diff --git a/b.txt b/b.txt
new file mode 100644
index 0000000..9f47804
--- /dev/null
+++ b/b.txt
@@ -0,0 +1 @@
+bbbbbb

From 83e98306077a6abc781b349068e5c5e11d0d9581 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Fri, 17 Jan 2025 18:30:34 +0800
Subject: [PATCH 33/38] update a and b

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

diff --git a/a.txt b/a.txt
index d83a8d7..82015bb 100644
--- a/a.txt
+++ b/a.txt
@@ -1,2 +1,2 @@
-aaaaaa
-
+iiiaiiiii
+bbbbbbbbb
diff --git a/b.txt b/b.txt
index 9f47804..3ee17b9 100644
--- a/b.txt
+++ b/b.txt
@@ -1 +1,2 @@
 bbbbbb
+111111111111

From 697a864e7fdcd44a98dd82b89d26ab70a5da08ab Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Tue, 21 Jan 2025 17:09:20 +0800
Subject: [PATCH 34/38] =?UTF-8?q?=E5=A2=9E=E5=8A=A0gitignore=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store

From c3953c9ddaad74f6e7be47e33c9c22d733ea97e5 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Tue, 21 Jan 2025 17:09:20 +0800
Subject: [PATCH 35/38] =?UTF-8?q?=E5=A2=9E=E5=8A=A0gitignore=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store

From fd8f2bb39fa40edcfc7688e8a046970c22444397 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Wed, 22 Jan 2025 14:19:30 +0800
Subject: [PATCH 36/38] =?UTF-8?q?DEV=20=E5=88=86=E6=94=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=86a=E5=92=8Cb=E4=B8=A4=E4=B8=AA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=88=86=E5=88=AB=E5=9C=A8=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E6=9C=80=E5=90=8E=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E4=B8=80=E8=A1=8C=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 a.txt | 1 +
 b.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/a.txt b/a.txt
index 82015bb..180d863 100644
--- a/a.txt
+++ b/a.txt
@@ -1,2 +1,3 @@
 iiiaiiiii
 bbbbbbbbb
+dev分支添加的这一行
diff --git a/b.txt b/b.txt
index 3ee17b9..a31f847 100644
--- a/b.txt
+++ b/b.txt
@@ -1,2 +1,3 @@
 bbbbbb
 111111111111
+dev分支修改时候，增加的这样的一行。

From a51bb0ced15670fd8cf1f45649ffe7abad2d44b1 Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Wed, 22 Jan 2025 14:23:31 +0800
Subject: [PATCH 37/38] =?UTF-8?q?dev=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=861=E5=92=8Ctest=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.txt    | 8 --------
 test.txt | 4 +---
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/1.txt b/1.txt
index 1dd5e60..b0f0716 100644
--- a/1.txt
+++ b/1.txt
@@ -1,12 +1,4 @@
-aaaaaaffff
-
-1.txt
-
-
-
 feng
 feng
 feng
 修改的1.txt
-
-
diff --git a/test.txt b/test.txt
index c618c40..007501b 100644
--- a/test.txt
+++ b/test.txt
@@ -1,4 +1,2 @@
-aaaaaaaa
-
-
 test
+修改test文件，在dev分支中修改的，增加了这一样.

From cf7754e9e931fe78177493533d77abdd76061ccd Mon Sep 17 00:00:00 2001
From: fengwenjian <wenjian@shanshu.ai>
Date: Wed, 22 Jan 2025 14:25:35 +0800
Subject: [PATCH 38/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86qa.txt?=
 =?UTF-8?q?=EF=BC=8Ctemp.txt=EF=BC=8C=E5=9C=A8dev=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qa.txt   | 8 +-------
 temp.txt | 3 +--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/qa.txt b/qa.txt
index 822f703..69bd614 100644
--- a/qa.txt
+++ b/qa.txt
@@ -1,7 +1 @@
-qa file
-
-
-aaaa
-
-
-dev 增加一行
+修改了qa.txt
diff --git a/temp.txt b/temp.txt
index 7345a18..16f0ca4 100644
--- a/temp.txt
+++ b/temp.txt
@@ -1,2 +1 @@
-iiiiii     aa
-temp
+修改了temp.txt，在dev分支。