diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java index 524148e81..e426d19ca 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java @@ -30,6 +30,7 @@ public class CVSStatus extends Status { public static final int PROTOCOL_ERROR = -23; public static final int ERROR_LINE_PARSE_FAILURE = -24; public static final int FAILED_TO_CACHE_SYNC_INFO = -25; + public static final int UNMEGERED_BINARY_CONFLICT = -26; // Path for resource related status private ICVSFolder commandRoot; |