| /* |
| * Copyright 2000-2009 JetBrains s.r.o. |
| * |
| * 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.intellij.openapi.vcs.merge; |
| |
| import com.intellij.openapi.vcs.history.VcsRevisionNumber; |
| import org.jetbrains.annotations.Nullable; |
| |
| /** |
| * MergeData contains 3 versions of raw file content used in 3-way merge. |
| * ORIGINAL - is the content which the file had before conflicting change; |
| * LAST - is the content which came from the server while updating. |
| * CURRENT - is the local change. |
| * {@link com.intellij.openapi.vcs.merge.MergeProvider} should initialize all three variables of the MergeData, because |
| * null value is treated as an error, not as blank content. |
| * |
| * @author lesya |
| */ |
| public class MergeData { |
| public byte[] ORIGINAL; |
| public byte[] LAST; |
| public byte[] CURRENT; |
| |
| @Nullable public VcsRevisionNumber LAST_REVISION_NUMBER; |
| } |