Compare commits

...

12 Commits
master ... new3

5 changed files with 12 additions and 18 deletions
Split View
  1. +0
    -0
      branch补丁测试.txt
  2. +10
    -16
      patch.diff
  3. +1
    -1
      冲突.txt
  4. +0
    -0
      测试补丁.txt
  5. +1
    -1
      重置.txt

+ 0
- 0
branch补丁测试.txt View File


+ 10
- 16
patch.diff View File

@@ -1,22 +1,16 @@
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 db24e255f17ef57d45cad309251e245e694bd299 Mon Sep 17 00:00:00 2001
From: "GYP\\54194" <gaoyunpeng@xinje.cc>
Date: Wed, 9 Jul 2025 10:21:14 +0800
Subject: [PATCH] no message

---
冲突.txt | 1 +
1 file changed, 1 insertion(+)
测试补丁.txt | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 测试补丁.txt

diff --git a/冲突.txt b/冲突.txt
index e69de29..7f88605 100644
--- a/冲突.txt
+++ b/冲突.txt
@@ -0,0 +1 @@
+远程修改
\ No newline at end of file
diff --git a/测试补丁.txt b/测试补丁.txt
new file mode 100644
index 0000000..e69de29
--
2.50.0.windows.2


+ 1
- 1
冲突.txt View File

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

+ 0
- 0
测试补丁.txt View File


+ 1
- 1
重置.txt View File

@@ -1 +1 @@
1
修改1

Loading…
Cancel
Save