From ec2d10723ecd0be878b9a12f65ca68a63f683706 Mon Sep 17 00:00:00 2001
From: jack <1395093509@qq.com>
Date: Sun, 26 Aug 2018 16:01:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 test.md

diff --git a/test.md b/test.md
new file mode 100644
index 0000000..0daa2fc
--- /dev/null
+++ b/test.md
@@ -0,0 +1,3 @@
+# 测试git
+
+- 新增更新，测试合并 merge --no-ff

From 89f3093edaae4f1861b082db7679ec1494f0f40c Mon Sep 17 00:00:00 2001
From: jack <1395093509@qq.com>
Date: Sun, 26 Aug 2018 16:04:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81--no-ff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test.md b/test.md
index 0daa2fc..305937f 100644
--- a/test.md
+++ b/test.md
@@ -1,3 +1,4 @@
 # 测试git
 
-- 新增更新，测试合并 merge --no-ff
+- 新增更新，测试合并
+- 合并代码使用 merge --no-ff