Author: echristo Date: Tue Apr 17 23:47:58 2007 New Revision: 123933 URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=123933 Log: Fix merge markers in ChangeLog. Modified: trunk/gcc/testsuite/ChangeLog