1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-29 16:44:03 +00:00

Merge conflicts.

This commit is contained in:
David E. O'Brien 2000-03-09 10:11:08 +00:00
parent 27d805042a
commit 40a121a27c
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=57849
2 changed files with 3 additions and 3 deletions

View File

@ -3986,7 +3986,7 @@ handle_directive (ip, op)
case '\'':
case '\"':
{
int backslash_newlines_p;
int backslash_newlines_p = 0;
register U_CHAR *bp1
= skip_quoted_string (xp - 1, bp, ip->lineno,

View File

@ -5031,7 +5031,7 @@ main (argc, argv)
if (! verbose_flag)
{
printf ("\nFor bug reporting instructions, please see:\n");
printf ("<URL:http://www.gnu.org/software/gcc/faq.html#bugreport>.\n");
printf ("%s.\n", GCCBUGURL);
exit (0);
}
@ -5224,7 +5224,7 @@ main (argc, argv)
if (print_help_list)
{
printf ("\nFor bug reporting instructions, please see:\n");
printf ("<URL:http://www.gnu.org/software/gcc/faq.html#bugreport>\n");
printf ("%s\n", GCCBUGURL);
}
exit (error_count > 0 ? (signal_count ? 2 : 1) : 0);