From c184c1a81a16a3f043c56837465d9972e6f8d73e Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Tue, 16 Feb 2016 11:34:36 -0800 Subject: [PATCH] Correctly handle --merge in the history.fish function Previously --merge happened to work, but only because it was smuggled in through the 'print' command --- share/functions/history.fish | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/functions/history.fish b/share/functions/history.fish index d513c191b..b6d8ee963 100644 --- a/share/functions/history.fish +++ b/share/functions/history.fish @@ -35,6 +35,7 @@ function history --description "Deletes an item from history" case --search set cmd print case --merge + set cmd merge case -- set -e argv[$i] break @@ -128,6 +129,8 @@ function history --description "Deletes an item from history" case save #Save changes to history file builtin history $argv + case merge + builtin history --merge case clear # Erase the entire history echo "Are you sure you want to clear history ? (y/n)"