org.eclipse.compare.internal.merge.MergeMessages.properties Maven / Gradle / Ivy

Go to download

Show more of this group Show more artifacts with this name
Show all versions of org.eclipse.compare Show documentation

This is org.eclipse.compare jar used by Scout SDK

The newest version!

###############################################################################
# Copyright (c) 2004, 2011 IBM Corporation 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:
#     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