From f1337a09db9f70b1ed23b15711a51d4eb72781bb Mon Sep 17 00:00:00 2001
From: fqx <qingxufan0923@163.com>
Date: Mon, 22 Nov 2021 14:42:01 +0800
Subject: [PATCH] develop merge feature before2

---
 test.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/test.js b/test.js
index 4c43c72..b4649d8 100644
--- a/test.js
+++ b/test.js
@@ -2,4 +2,7 @@
 
 feature1
 
-feature:rebase
\ No newline at end of file
+feature:rebase
+
+feature:merge
+

--
Gitblit v1.9.1