From 0395c33982db8dd6336b11c1f1106ac08cf21c5b Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 16 Feb 2016 11:38:31 -0800
Subject: Stop always returning STATUS_BUILTIN_ERROR on --merge.

---
 src/builtin.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/builtin.cpp')

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 991c33da..ae6c85b2 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -3868,6 +3868,7 @@ static int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **ar
     if (merge_history)
     {
         history->incorporate_external_changes();
+        return STATUS_BUILTIN_OK;
     }
 
     if (search_history)
-- 
cgit v1.2.3