From dc45ab8d96ea175abd3c48eea8b35e57a226b6f0 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Sun, 24 May 2020 16:41:23 +0800
Subject: [PATCH] fix(Cli): merge commit lint failed in some cases (#6360)

---
 packages/vant-cli/src/commands/commit-lint.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vant-cli/src/commands/commit-lint.ts b/packages/vant-cli/src/commands/commit-lint.ts
index 6937cc3f3..1c04bac34 100644
--- a/packages/vant-cli/src/commands/commit-lint.ts
+++ b/packages/vant-cli/src/commands/commit-lint.ts
@@ -2,7 +2,7 @@ import { readFileSync } from 'fs-extra';
 import { consola } from '../common/logger';
 
 const commitRE = /^(revert: )?(fix|feat|docs|perf|test|types|style|build|chore|refactor|breaking change)(\(.+\))?: .{1,50}/;
-const mergeRE = /Merge branch /;
+const mergeRE = /Merge /;
 
 export function commitLint() {
   const gitParams = process.env.HUSKY_GIT_PARAMS as string;