Merge branch 'fenzhi2' into fenzhi3

# Conflicts:
#	.gitignore
#	hello.txt

.gitignore

@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+*.txt
+=======
+*.txt
+>>>>>>> fenzhi2

1.txt

@@ -0,0 +1 @@
+111

hello.txt

@@ -1 +1,2 @@
-hello
+hello
+2

patch.diff

@@ -0,0 +1,21 @@
+From b5aece2d48b7528e03e4d01ace22af2902fa0ef9 Mon Sep 17 00:00:00 2001
+From: Wuxiaowen <2371806495@qq.com>
+Date: Tue, 15 Jul 2025 10:59:52 +0800
+Subject: [PATCH] 111
+
+---
+ 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
+