if (expectedMerge == null ? actualMerge == null : expectedMerge.equals(actualMerge)) { System.out.println("are the same on " + getName()); } else { System.out.println("are NOT the same on " + getName()); System.out.println("============================\nexpectedMerge\n============================\n" + expectedMerge); System.out.println("============================\nactualMerge\n============================\n" + actualMerge); }
  protected void verifyMerge(String targetContents)  {    // extract merged contents    StringBuffer mergeResult = new StringBuffer(targetContents);        // The merge expected file was saved without any '\r' so    // we need to remove it from the mergedResult    for (int i=mergeResult.length()-1; i >= 0; i--)    {      if ('\r' == mergeResult.charAt(i))      {        mergeResult.deleteCharAt(i);      }    }        String expectedMerge = TestUtil.readFile(expected, false);    String actualMerge = mergeResult.toString();    if (expectedMerge == null ? actualMerge == null : expectedMerge.equals(actualMerge))    {      System.out.println("are the same on " + getName());    }    else    {      System.out.println("are NOT the same on " + getName());      System.out.println("============================\nexpectedMerge\n============================\n" + expectedMerge);      System.out.println("============================\nactualMerge\n============================\n" + actualMerge);    }    assertEquals("Make sure the line breaks are OK.  The expected merge should have no '\r'", expectedMerge, actualMerge);      }