Fix --merge hitting a case

This commit is contained in:
Aaron Gyes 2016-02-16 05:09:54 -08:00
parent 81cdceddd3
commit a6565bbea8

View file

@ -34,12 +34,13 @@ function history --description "Deletes an item from history"
set cmd clear set cmd clear
case --search case --search
set cmd print set cmd print
case --merge
case -- case --
set -e argv[$i] set -e argv[$i]
break break
case -* --* case "-*" "--*"
printf ( _ "%s: invalid option -- %s\n" ) history $argv[1] >& 2 printf ( _ "%s: invalid option -- %s\n" ) history $argv[1] >& 2
return 1 return
end end
end end
else else