diff options
| author |  Aaron Gyes <me@aaron.gy> | 2016-02-16 11:38:31 -0800 |
|---|---|---|
| committer |  ridiculousfish <corydoras@ridiculousfish.com> | 2016-02-16 12:06:50 -0800 |
| commit | 0395c33982db8dd6336b11c1f1106ac08cf21c5b (patch) | |
| tree | 0d4570558a9abb8a1f6339b6abc16dcd527fc197 /src/builtin.cpp | |
| parent | 83d3c9fc04f9f9f4b0868e4d348b47a205530d19 (diff) | |
Stop always returning STATUS_BUILTIN_ERROR on --merge.
Diffstat (limited to 'src/builtin.cpp')
| -rw-r--r-- | src/builtin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/builtin.cpp b/src/builtin.cpp index 991c33da..ae6c85b2 100644 --- a/src/builtin.cpp +++ b/src/builtin.cpp @@ -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) |