Merge branch 'jc/maint-mergetool-read-fix'

diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c
index 2eb0ee44b87a08750e3789ff9132d55a6abd96f9..5ddd6886c85356164e81c477d3a170343bc28049 100644 (file)
--- a/sh-i18n--envsubst.c
+++ b/sh-i18n--envsubst.c
@@ -51,7 +51,6 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <errno.h>
-#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -74,6 +73,7 @@ main (int argc, char *argv[])
        {
        case 1:
          error ("we won't substitute all variables on stdin for you");
+         break;
          /*
          all_variables = 1;
       subst_from_stdin ();