aboutsummaryrefslogtreecommitdiffhomepage
path: root/share/functions
diff options
context:
space:
mode:
authorGravatar Aaron Gyes <me@aaron.gy>2016-02-16 05:09:54 -0800
committerGravatar Aaron Gyes <me@aaron.gy>2016-02-16 05:09:54 -0800
commita6565bbea8bdcb895693c0406c7021254c5d60f4 (patch)
treec718a70195918771d24d7411840aee8085bc7145 /share/functions
parent81cdceddd33bf831d206f6cd167c6bae5ef81225 (diff)
Fix --merge hitting a case
Diffstat (limited to 'share/functions')
-rw-r--r--share/functions/history.fish5
1 files changed, 3 insertions, 2 deletions
diff --git a/share/functions/history.fish b/share/functions/history.fish
index 544fec03..3d272cf0 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