Merge getpass with quote, plus my NEWS entry.

[wget] / src / main.c

diff --git a/src/main.c b/src/main.c
index e23a9b12db3e08d52e082de312be13c44f0a5643..5fb91664ca65e63ec728550e7caa92c385248dc9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -914,10 +914,10 @@ will be placed in the single file you specified.\n\n"));
         }
       if (opt.timestamping)
         {
-          fputs (_("\
-Cannot specify -N if -O is given. See the manual for details.\n\n"), stdout);
-          print_usage ();
-          exit (1);
+          logprintf (LOG_NOTQUIET, "%s", _("\
+WARNING: timestamping does nothing in combination with -O. See the manual\n\
+for details.\n\n"));
+          opt.timestamping = false;
         }
     }