Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties')
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties4
1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties b/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties
index 4fde52460a..ecb23f4df0 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties
@@ -73,6 +73,10 @@ ResetOperation_readingIndex=Reading index
ResetOperation_updatingFailed=Updating {0} failed
ResetOperation_writingIndex=Writing index
+MergeOperation_InternalError=An internal error occured
+MergeOperation_MergeFailedNoHead=Merge failed: Reference to HEAD does not exist
+MergeOperation_MergeFailedRefUpdate=Merge failed: Another process is accessing the ref
+MergeOperation_ProgressMerge=Merge {0}
MoveDeleteHook_cannotModifyFolder=Folder contains an active Git repository.\n\
The folder cannot be moved, renamed or deleted until the team provider is disconnected.

Back to the top