path: root/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/MergeMessages.properties

###############################################################################
# Copyright (c) 2004, 2011 IBM Corporation and others.
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
#     IBM Corporation - initial API and implementation
###############################################################################

TextAutoMerge_inputEncodingError= Unsupported encoding for input streams
TextAutoMerge_outputEncodingError= Unsupported encoding for output streams
TextAutoMerge_outputIOError= IO error on writing
TextAutoMerge_conflict= Conflict: cannot auto merge