26 lines
1002 B
Java
26 lines
1002 B
Java
// Copyright (C) 2016 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 that the change or commit is already in the source tree. */
|
|
public class ChangeAlreadyMergedException extends MergeIdenticalTreeException {
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
/** @param msg message to return to the client describing the error. */
|
|
public ChangeAlreadyMergedException(String msg) {
|
|
super(msg);
|
|
}
|
|
}
|