Skip to main content
aboutsummaryrefslogtreecommitdiffstats
blob: a548ea8e6006eff6635e4ffb4ceb83f77a4e796c (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
###############################################################################
# Copyright (c) 2004, 2006 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

Back to the top