From f7811c978fd6e93b838d0ec05ab75d2073a662ec Mon Sep 17 00:00:00 2001
From: Seva Luchianov <seva.luchianov@everykey.com>
Date: Mon, 28 Oct 2019 18:09:15 -0400
Subject: [PATCH 1/3] Add failing test for issue 176

---
 test/merge.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/merge.js b/test/merge.js
index fa2ac5b..89cf55d 100644
--- a/test/merge.js
+++ b/test/merge.js
@@ -667,3 +667,20 @@ test('Falsey properties should be mergeable', function(t) {
 	t.ok(customMergeWasCalled, 'custom merge function was called')
 	t.end()
 })
+
+test('Does not override non-object properties with empty object', function(t) {
+    var target = {
+        bool: true
+    }
+
+    var source = {}
+
+    var result = merge(target, source, {
+        isMergeableObject: function() {
+            return true
+        }
+    })
+
+    t.equal(result, target)
+    t.end()
+})
\ No newline at end of file

From d9ba05e4495d8fb59bd83c42dcd7e69cf9b6ea43 Mon Sep 17 00:00:00 2001
From: Seva Luchianov <seva.luchianov@gmail.com>
Date: Tue, 29 Oct 2019 11:54:07 -0400
Subject: [PATCH 2/3] Update test/merge.js

Co-Authored-By: Josh Duff <me@JoshDuff.com>
---
 test/merge.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/merge.js b/test/merge.js
index 89cf55d..ff42208 100644
--- a/test/merge.js
+++ b/test/merge.js
@@ -681,6 +681,6 @@ test('Does not override non-object properties with empty object', function(t) {
         }
     })
 
-    t.equal(result, target)
+    t.equal(result.bool, true)
     t.end()
-})
\ No newline at end of file
+})

From 7ec267866c58719c058481226d3ea8cb28eb81df Mon Sep 17 00:00:00 2001
From: Seva Luchianov <seva.luchianov@everykey.com>
Date: Tue, 29 Oct 2019 13:22:29 -0400
Subject: [PATCH 3/3] Tabs not spaces

---
 test/merge.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/merge.js b/test/merge.js
index ff42208..79853c4 100644
--- a/test/merge.js
+++ b/test/merge.js
@@ -669,18 +669,18 @@ test('Falsey properties should be mergeable', function(t) {
 })
 
 test('Does not override non-object properties with empty object', function(t) {
-    var target = {
-        bool: true
-    }
+	var target = {
+		bool: true
+	}
 
-    var source = {}
+	var source = {}
 
-    var result = merge(target, source, {
-        isMergeableObject: function() {
-            return true
-        }
-    })
+	var result = merge(target, source, {
+		isMergeableObject: function() {
+			return true
+		}
+	})
 
-    t.equal(result.bool, true)
-    t.end()
+	t.equal(result.bool, true)
+	t.end()
 })