| ################################################################################ |
| # Copyright (c) 2015 Obeo and others. |
| # All rights reserved. This program and the accompanying materials |
| # are made available under the terms of the Eclipse Public License v1.0 |
| # which accompanies this distribution, and is available at |
| # http://www.eclipse.org/legal/epl-v10.html |
| # |
| # 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. |
| ValidationUtils_CanNotResolveRefMessage = Cannot resolve {0} |
| |
| 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? |
