Adrian Leonhard 6ab5d97a5d Changed "Duplicate Identifier" to "enum cannot be merged..." (#18579)
* Changed "Duplicate Identifier" to "enum can only be merged..."
when either declaration of the identifier is an enum.

Partial (?) fix for #529

Not sure if the new test is necessary, all the cases seem to have been covered by others tests.

* picked a nit
2018-02-12 13:38:08 -08:00
..
2018-02-05 13:56:22 -08:00
2017-11-16 10:58:12 -08:00
2018-01-08 17:25:56 -08:00
2018-01-11 16:45:44 -08:00
2017-10-06 09:22:10 -07:00
2017-11-13 10:55:33 -08:00
2017-11-16 11:08:03 -08:00