From 0d58218eacdf05eb5a9a7fa221524590f9363993 Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@qq.com>
Date: Mon, 11 Dec 2023 19:02:24 +0800
Subject: [PATCH] =?UTF-8?q?merge=20=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index 8a631da..07028b4 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## v2.3.8 (2023-12-11)
 
+### 新功能
+
+- merge 支持文件夹输入
+
 ### 优化
 
 - merge 参数修改