|
|
|
@@ -1,21 +1,30 @@ |
|
|
|
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 |
|
|
|
From 3bdfc3c09a53450070d9682e1431cfa14177bfaf Mon Sep 17 00:00:00 2001 |
|
|
|
From: "GYP\\54194" <gaoyunpeng@xinje.cc> |
|
|
|
Date: Fri, 11 Jul 2025 16:07:43 +0800 |
|
|
|
Subject: [PATCH] no message |
|
|
|
|
|
|
|
--- |
|
|
|
冲突.txt | 1 + |
|
|
|
1 file changed, 1 insertion(+) |
|
|
|
忽略我.txt | 1 + |
|
|
|
补丁1.txt | 1 + |
|
|
|
2 files changed, 2 insertions(+) |
|
|
|
create mode 100644 忽略我.txt |
|
|
|
create mode 100644 补丁1.txt |
|
|
|
|
|
|
|
diff --git a/冲突.txt b/冲突.txt |
|
|
|
index e69de29..7f88605 100644 |
|
|
|
--- a/冲突.txt |
|
|
|
+++ b/冲突.txt |
|
|
|
diff --git a/忽略我.txt b/忽略我.txt |
|
|
|
new file mode 100644 |
|
|
|
index 0000000..56a6051 |
|
|
|
--- /dev/null |
|
|
|
+++ b/忽略我.txt |
|
|
|
@@ -0,0 +1 @@ |
|
|
|
+远程修改 |
|
|
|
+1 |
|
|
|
\ No newline at end of file |
|
|
|
diff --git a/补丁1.txt b/补丁1.txt |
|
|
|
new file mode 100644 |
|
|
|
index 0000000..56a6051 |
|
|
|
--- /dev/null |
|
|
|
+++ b/补丁1.txt |
|
|
|
@@ -0,0 +1 @@ |
|
|
|
+1 |
|
|
|
\ No newline at end of file |
|
|
|
-- |
|
|
|
2.50.0.windows.2 |
|
|
|
|
