From a6565bbea8bdcb895693c0406c7021254c5d60f4 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 16 Feb 2016 05:09:54 -0800
Subject: [PATCH] Fix --merge hitting a case

---
 share/functions/history.fish | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/share/functions/history.fish b/share/functions/history.fish
index 544fec036..3d272cf0e 100644
--- a/share/functions/history.fish
+++ b/share/functions/history.fish
@@ -34,12 +34,13 @@ function history --description "Deletes an item from history"
 				set cmd clear
 			case --search
 				set cmd print
+			case --merge
 			case --
 				set -e argv[$i]
 				break
-			case -* --*
+			case "-*" "--*"
 				printf ( _ "%s: invalid option -- %s\n" ) history $argv[1] >& 2
-				return 1
+				return 
 			end
 		end
 	else