From 17a967123cc1c06f15146a463b99816d4ca5f2b2 Mon Sep 17 00:00:00 2001
From: Thibault Ehrhart <1208424+ehrhart@users.noreply.github.com>
Date: Sat, 15 Feb 2020 14:49:26 +0100
Subject: [PATCH] Adding responseEncoding to mergeConfig (#1745)

Co-authored-by: Xianming Zhong <chinesedfan@qq.com>
---
 lib/core/mergeConfig.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/core/mergeConfig.js b/lib/core/mergeConfig.js
index 827d6df..5d9b042 100644
--- a/lib/core/mergeConfig.js
+++ b/lib/core/mergeConfig.js
@@ -22,7 +22,7 @@ module.exports = function mergeConfig(config1, config2) {
     'timeout', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName',
     'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress',
     'maxContentLength', 'validateStatus', 'maxRedirects', 'httpAgent',
-    'httpsAgent', 'cancelToken', 'socketPath'
+    'httpsAgent', 'cancelToken', 'socketPath', 'responseEncoding'
   ];
 
   utils.forEach(valueFromConfig2Keys, function valueFromConfig2(prop) {