Merge branch 'new' of http://gitea.xinje.cc/gaoyunpeng/clone_test into new

.gitignore

@@ -0,0 +1,5 @@
+需要忽略.txt
+<<<<<<< HEAD
+停止跟踪.txt
+=======
+>>>>>>> no message

patch.diff

@@ -0,0 +1,22 @@
+From 926d82cddb8462a6251994e0ebd8e34737806004 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E4=BA=91=E9=B9=8F=20=E9=AB=98?= <gaoyunpeng@xinje.cc>
+Date: Mon, 7 Jul 2025 20:05:08 +0800
+Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'=E5=86=B2=E7=AA=81.txt'?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ 冲突.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/冲突.txt b/冲突.txt
+index e69de29..7f88605 100644
+--- a/冲突.txt
++++ b/冲突.txt
+@@ -0,0 +1 @@
++远程修改
+\ No newline at end of file
+-- 
+2.50.0.windows.2
+

test2.txt

@@ -1 +0,0 @@
-123

冲突.txt

@@ -0,0 +1 @@
+远程修改

重置.txt

@@ -0,0 +1,3 @@
+1
+2
+new