// Copyright (C) 2008 The Android Open Source Project
//
// Licensed 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
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// 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 com.google.gerrit.server.git;

/** Indicates the current branch's queue cannot be processed at this time. */
public class MergeException extends Exception {
  private static final long serialVersionUID = 1L;

  public MergeException(final String msg) {
    super(msg, null);
  }

  public MergeException(final String msg, final Throwable why) {
    super(msg, why);
  }
}

@@ -835,38 +835,32 @@
  MergeException(
-final 
 String msg) %7B%0A  
@@ -874,14 +874,70 @@
 (msg
-, null
+);%0A  %7D%0A%0A  public MergeException(Throwable why) %7B%0A    super(why
 );%0A 
@@ -964,22 +964,16 @@
 ception(
-final 
 String m
@@ -975,22 +975,16 @@
 ing msg,
- final
  Throwab

Clean up MergeException