summaryrefslogtreecommitdiff
path: root/tools/eslint/node_modules/lodash/_mergeDefaults.js
diff options
context:
space:
mode:
Diffstat (limited to 'tools/eslint/node_modules/lodash/_mergeDefaults.js')
-rw-r--r--tools/eslint/node_modules/lodash/_mergeDefaults.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/eslint/node_modules/lodash/_mergeDefaults.js b/tools/eslint/node_modules/lodash/_mergeDefaults.js
index b09c66b43d..33375cc5bb 100644
--- a/tools/eslint/node_modules/lodash/_mergeDefaults.js
+++ b/tools/eslint/node_modules/lodash/_mergeDefaults.js
@@ -10,13 +10,13 @@ var baseMerge = require('./_baseMerge'),
* @param {string} key The key of the property to merge.
* @param {Object} object The parent object of `objValue`.
* @param {Object} source The parent object of `srcValue`.
- * @param {Object} [stack] Tracks traversed source values and their merged counterparts.
+ * @param {Object} [stack] Tracks traversed source values and their merged
+ * counterparts.
* @returns {*} Returns the value to assign.
*/
function mergeDefaults(objValue, srcValue, key, object, source, stack) {
if (isObject(objValue) && isObject(srcValue)) {
- stack.set(srcValue, objValue);
- baseMerge(objValue, srcValue, undefined, mergeDefaults, stack);
+ baseMerge(objValue, srcValue, undefined, mergeDefaults, stack.set(srcValue, objValue));
}
return objValue;
}