From 62a4e4cb829abb28686e165d951d1da3c2f6ba77 Mon Sep 17 00:00:00 2001
From: Miku-he <1319265705@qq.com>
Date: Wed, 8 Jun 2022 15:03:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=BA=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

第四次修改
---
 vuex_demo1/test.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vuex_demo1/test.txt b/vuex_demo1/test.txt
index 4009c95..c12081e 100644
--- a/vuex_demo1/test.txt
+++ b/vuex_demo1/test.txt
@@ -2,4 +2,7 @@
 主分支修改
 测试合并
 update dev
-
+第一次提交
+第二次提交
+第三次提交
+第四次提交

From ec0bc3a6ebb29497a3807d2e0c9971d08f27e399 Mon Sep 17 00:00:00 2001
From: Miku-he <1319265705@qq.com>
Date: Thu, 9 Jun 2022 08:46:59 +0800
Subject: [PATCH 2/3] test edit command

---
 vuex_demo1/hdrebase.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 vuex_demo1/hdrebase.txt

diff --git a/vuex_demo1/hdrebase.txt b/vuex_demo1/hdrebase.txt
new file mode 100644
index 0000000..03c7d00
--- /dev/null
+++ b/vuex_demo1/hdrebase.txt
@@ -0,0 +1 @@
+test edit command

From a1672bec146cad49d3b51ecdb5029a688ee75a6f Mon Sep 17 00:00:00 2001
From: Miku-he <1319265705@qq.com>
Date: Thu, 9 Jun 2022 08:46:59 +0800
Subject: [PATCH 3/3] add hdrebase.txt to test edit command

---
 vuex_demo1/hdrebase.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vuex_demo1/hdrebase.txt b/vuex_demo1/hdrebase.txt
index 03c7d00..81db815 100644
--- a/vuex_demo1/hdrebase.txt
+++ b/vuex_demo1/hdrebase.txt
@@ -1 +1 @@
-test edit command
+add hdrebase.txt to test edit command