Use lodash/merge from Hexo dependencies

stevenjoezhang · stevenjoezhang · commit d0c52baa06b8 · 2019-07-22T02:04:04.000+08:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1 @@
 source/lib/* linguist-vendored
-scripts/merge.js linguist-vendored
diff --git a/scripts/merge-configs.js b/scripts/merge-configs.js
@@ -2,7 +2,7 @@
 
 'use strict';
 
-var merge = require('./merge');
+var merge = require('lodash/merge');
 
 hexo.on('generateBefore', function() {
   if (hexo.locals.get) {
diff --git a/scripts/merge.js b/scripts/merge.js

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`source/lib/* linguist-vendored`
`2`		`-scripts/merge.js linguist-vendored`