@Override
  @RequiresEdt
  public void rediff(boolean trySync) {
    if (myInitialRediffStarted) return;
    myInitialRediffStarted = true;
    assert myAllMergeChanges.isEmpty();
    doRediff();
  }
@Override
  @RequiresEdt
  public void rediff(boolean trySync)