From 7b5b7784c89956387e2d43dcf31a652dae61976f Mon Sep 17 00:00:00 2001 From: Chiri Date: Mon, 7 Jul 2025 15:44:00 +0800 Subject: [PATCH] no message Signed-off-by: Chiri --- README.md | 8 ++++++++ README.md.rej | 11 +++++++---- patch.diff | 25 +++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 patch.diff diff --git a/README.md b/README.md index 063bdab..0fab852 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,12 @@ _再来一次_ +<<<<<<< HEAD Master/New1 提交测试 +======= + + + + +Master 提交测试 +>>>>>>> Master diff --git a/README.md.rej b/README.md.rej index 86e28a0..4f23965 100644 --- a/README.md.rej +++ b/README.md.rej @@ -1,6 +1,9 @@ diff a/README.md b/README.md (rejected hunks) -@@ -0,0 +1,3 @@ -+# MyFirst -+ -+测试 +@@ -9,4 +9,4 @@ _再来一次_ + + + +-USR1 提交测试 +\ No newline at end of file ++Master 提交测试 \ No newline at end of file diff --git a/patch.diff b/patch.diff new file mode 100644 index 0000000..488a61b --- /dev/null +++ b/patch.diff @@ -0,0 +1,25 @@ +From 1a70d34ea5e491580f2fa6b950007cd547fbf7c1 Mon Sep 17 00:00:00 2001 +From: Chiri +Date: Mon, 7 Jul 2025 15:31:34 +0800 +Subject: [PATCH] Master + +Signed-off-by: Chiri +--- + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/README.md b/README.md +index cfa29ac..c9eab4f 100644 +--- a/README.md ++++ b/README.md +@@ -9,4 +9,4 @@ _再来一次_ + + + +-USR1 提交测试 +\ No newline at end of file ++Master 提交测试 +\ No newline at end of file +-- +2.45.2.windows.1 +