type-clash diagnostic wording consistency

[Paul Eggert]

reader.c generates these two diagnostics:

  type clash (`T1' `T2') on default action
  result type clash on merge function F: `T1' vs. `T2'

It's better if we use consistent wording, so I changed the wording of
the latter to:

  result type clash (`T1' `T2') on merge function F

in the following patch.

2002-11-02  Paul Eggert  <address@hidden>

        * src/reader.c: Don't include quote.h; not needed.
        (get_merge_function): Reword warning to be consistent with
        type clash diagnostic in grammar_current_rule_check.

--- reader.c.~1.214.~   2002-10-23 11:41:04.000000000 -0700
+++ reader.c    2002-11-02 23:45:22.783845000 -0800
@@ -22,7 +22,6 @@
 
 #include "system.h"
 #include "quotearg.h"
-#include "quote.h"
 #include "getargs.h"
 #include "files.h"
 #include "symtab.h"
@@ -138,8 +137,8 @@ get_merge_function (const char* name, co
       merge_functions = head.next;
     }
   else if (strcmp (type, syms->next->type) != 0)
-    warn_at (loc, _("result type clash on merge function %s: `%s' vs. `%s'"),
-            name, type, syms->next->type);
+    warn_at (loc, _("result type clash (`%s' `%s') on merge function %s"),
+            type, syms->next->type, name);
   return n;
 }