Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-09-23 07:52:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stop always returning STATUS_BUILTIN_ERROR on --merge.

Browse source
This commit is contained in:
Aaron Gyes 2016-02-16 11:38:31 -08:00 committed by ridiculousfish
parent 83d3c9fc04
commit 0395c33982
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/builtin.cpp
View file

@ -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)