Merging upstream version 4.2.6.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 0 deletions

diff --git a/mergecap.c b/mergecap.c
index 41be4e22..7a08390d 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -416,6 +416,15 @@ main(int argc, char *argv[])
             cfile_close_failure_message(out_filename, err, err_info);
             break;
 
+        case MERGE_ERR_INVALID_OPTION:
+            if (err_info) {
+                cmdarg_err("%s", err_info);
+            }
+            else {
+                cmdarg_err("Unspecified error with merge option");
+            }
+            break;
+
         default:
             cmdarg_err("Unknown merge_files error %d", status);
             break;