修改内容

This reverts commit fbcbb286f69daafb4e1135fd3d43be952752449c, reversing
changes made to 116b6f6fb4.

1.txt

@@ -1,4 +1,5 @@
 111
 222
 添加内容
-丢弃内容
+丢弃内容
+修改内容

3.txt

@@ -1 +1,3 @@
-测试补丁应用
+测试补丁应用
+部分内容一致
+测试补丁应用

3_BACKUP_1793.txt

@@ -0,0 +1,3 @@
+测试补丁应用
+部分内容一致
+测试补丁应用

3_LOCAL_1793.txt

@@ -0,0 +1,2 @@
+测试补丁应用
+部分内容一致

3_REMOTE_1793.txt

@@ -0,0 +1 @@
+测试补丁应用

4.txt

@@ -1 +0,0 @@
-444

patch.diff

@@ -0,0 +1,26 @@
+From 2af4ca66b0c8c53fe88845c37c5fb002ebc264b6 Mon Sep 17 00:00:00 2001
+From: wangxinyu <2788673683@qq.com>
+Date: Wed, 16 Jul 2025 12:19:48 +0800
+Subject: [PATCH] =?UTF-8?q?=E6=83=85=E5=86=B54=E5=88=9B=E5=BB=BA=E4=B8=80?=
+ =?UTF-8?q?=E4=B8=AA=E6=96=B0=E6=96=87=E4=BB=B6=EF=BC=88=E5=BA=94=E7=94=A8?=
+ =?UTF-8?q?=E5=88=86=E6=94=AF=E6=B2=A1=E6=9C=89=E7=9A=84=EF=BC=89?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ 4.txt | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.txt
+
+diff --git a/4.txt b/4.txt
+new file mode 100644
+index 0000000..cb856a4
+--- /dev/null
++++ b/4.txt
+@@ -0,0 +1 @@
++444
+\ No newline at end of file
+-- 
+2.49.0.windows.1
+