patch.diff

# Conflicts:
#	1.txt

1.txt

@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 111
-222
+222
+fenzhi2修改
+=======
+111
+>>>>>>> 1

patch.diff

@@ -0,0 +1,21 @@
+From c8b0b3d3969ed0395a288ff4570e2939ab5c96d1 Mon Sep 17 00:00:00 2001
+From: Wuxiaowen <2371806495@qq.com>
+Date: Mon, 14 Jul 2025 09:11:32 +0800
+Subject: [PATCH] 1
+
+---
+ 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..9d07aa0
+--- /dev/null
++++ b/1.txt
+@@ -0,0 +1 @@
++111
+\ No newline at end of file
+-- 
+2.46.0.windows.1
+