From b4b46801f99f2a91355dc561be44c4b58ee082f3 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Wed, 11 Aug 2010 15:51:34 +0400 Subject: [PATCH] javadoc for MergeData. --- .../src/com/intellij/openapi/vcs/merge/MergeData.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeData.java b/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeData.java index a496978c104d..5b156cca4934 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeData.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeData.java @@ -19,6 +19,13 @@ 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 {