blob: 9b2ad5bcb4f97439b459ad05c91776d8cb3812d2 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
|
################################################################################
# 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.
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?
|
