/**
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 * <p>
 * http://www.apache.org/licenses/LICENSE-2.0
 * <p>
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.apache.hadoop.conf;

/**
 * Tests again for Configuration.java.
 *
 * test merge1
 * test merge2
 *
 * test merge3 with squash
 * test merge4 with squash
 *
 * test merge 5 with simple action
 */
public class TestConfiguration {
}

@@ -1008,16 +1008,51 @@
  action%0A
+ * test merge 6 with simple action%0A
  */%0Apubl

test merge 6 with simple action