2010-05-21 Joseph Myers <joseph@codesourcery.com>
+ * cxx-pretty-print.c: Correct merge error.
+
+2010-05-21 Joseph Myers <joseph@codesourcery.com>
+
* error.c: Include tree-diagnostic.h and tree-pretty-print.h.
(cp_print_error_function): Use diagnostic_abstract_origin macro.
(cp_printer): Handle %K here using percent_K_format.
#include "coretypes.h"
#include "tm.h"
#include "intl.h"
-#include "tree-pretty-print.h"
#include "cp-tree.h"
#include "cxx-pretty-print.h"
+#include "tree-pretty-print.h"
#include "toplev.h"
/* Translate if being used for diagnostics, but not for dump files or