Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Borkowski2015-07-16 09:27:27 -0400
committerMichael Borkowski2015-10-15 03:28:29 -0400
commitf578950d9fd83d188eacd4c957967cbf411d4e5d (patch)
tree7c38b8271724c6da5e0d7f4a3e5db8d59a0c5838
parent987f32f9cb833a552dfd037256348c0faf88c51b (diff)
downloadorg.eclipse.emf.compare-f578950d9fd83d188eacd4c957967cbf411d4e5d.tar.gz
org.eclipse.emf.compare-f578950d9fd83d188eacd4c957967cbf411d4e5d.tar.xz
org.eclipse.emf.compare-f578950d9fd83d188eacd4c957967cbf411d4e5d.zip
[462863] UI Messages for EGit bundle
UI messages for the post-merge staging dialog have been introduced. This is required for a subsequent change for bug 462863. Bug: 462863 Change-Id: I64103e68c739d7d0fd8af1ff3597bcaceb797a04 Signed-off-by: Michael Borkowski <mborkowski@eclipsesource.com>
-rw-r--r--plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/egit_ide_ui_messages.properties6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/egit_ide_ui_messages.properties b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/egit_ide_ui_messages.properties
index 253c4b993..9b2ad5bcb 100644
--- a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/egit_ide_ui_messages.properties
+++ b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/egit_ide_ui_messages.properties
@@ -8,8 +8,12 @@
# Contributors:
# Obeo - initial API and implementation
# Philip Langer - adds message for duplicate ID in IdentifierEObjectMatcher
+# Michael Borkowski - post-merge staging dialog messages
################################################################################
## ! note ! double the apostrophes if you need one in the printed String
GitMergeEditorInput_OutOfWSResources = Some of the conflicting resources were not in the workspace. Please manually use the merge tool on the offending files.
-GitMergeEditorInput_MultipleModels = There are multiple models involved in this conflict. Please manually use the merge tool on all distinct files. \ No newline at end of file
+GitMergeEditorInput_MultipleModels = There are multiple models involved in this conflict. Please manually use the merge tool on all distinct files.
+
+post.merge.dialog.title = Stage Merged Files
+post.merge.dialog.text = All merge conflicts in the current model have been resolved. Do you want to stage the containing resources, marking the conflicting files as resolved?

Back to the top