michal@trpaslik:/builds/cvs/orion/nb_all/core$ cvs -z6 -q -n up -r orion_fcs    
michal@trpaslik:/builds/cvs/orion/nb_all/core$ cvs -z6 -q up -j orion_fcs_ml
RCS file: /cvs/core/build.xml,v
retrieving revision 1.45
retrieving revision 1.45.20.1
Merging differences between 1.45 and 1.45.20.1 into build.xml
RCS file: /cvs/core/Attic/l10n.list.translated_ja,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.2
Merging differences between 1.1.2.2 and 1.1.2.2.2.2 into l10n.list.translated_ja
cvs server: file l10n.list.translated_ja.partial exists, but has been added in revision orion_fcs_ml
RCS file: /cvs/core/release/bin/runide.sh,v
retrieving revision 1.23.4.1.4.3
retrieving revision 1.23.4.1.4.3.2.1
Merging differences between 1.23.4.1.4.3 and 1.23.4.1.4.3.2.1 into runide.sh
RCS file: /cvs/core/src/org/netbeans/beaninfo/Bundle_ja.properties,v
retrieving revision 1.11.40.1.2.2.2.1
retrieving revision 1.11.40.1.2.2.2.1.2.1
Merging differences between 1.11.40.1.2.2.2.1 and 1.11.40.1.2.2.2.1.2.1 into Bundle_ja.properties
RCS file: /cvs/core/src/org/netbeans/beaninfo/editors/Bundle_ja.properties,v
retrieving revision 1.12.22.2.2.2.2.1
retrieving revision 1.12.22.2.2.2.2.1.2.1
Merging differences between 1.12.22.2.2.2.2.1 and 1.12.22.2.2.2.2.1.2.1 into Bundle_ja.properties
RCS file: /cvs/core/src/org/netbeans/beaninfo/swing/Bundle_ja.properties,v
retrieving revision 1.1.6.1.2.2
retrieving revision 1.1.6.1.2.2.4.1
Merging differences between 1.1.6.1.2.2 and 1.1.6.1.2.2.4.1 into Bundle_ja.properties
RCS file: /cvs/core/src/org/netbeans/core/Bundle_ja.properties,v
retrieving revision 1.25.26.1.2.2.2.1
retrieving revision 1.25.26.1.2.2.2.1.2.1
Merging differences between 1.25.26.1.2.2.2.1 and 1.25.26.1.2.2.2.1.2.1 into Bundle_ja.properties
RCS file: /cvs/core/src/org/netbeans/core/NonGui.java,v
retrieving revision 1.49.2.2.4.1
retrieving revision 1.49.2.2.4.1.2.1
Merging differences between 1.49.2.2.4.1 and 1.49.2.2.4.1.2.1 into NonGui.java
RCS file: /cvs/core/src/org/netbeans/core/Plain.java,v
retrieving revision 1.21
retrieving revision 1.21.22.1
Merging differences between 1.21 and 1.21.22.1 into Plain.java
RCS file: /cvs/core/src/org/netbeans/core/compiler/Attic/Bundle_ja.properties,v
retrieving revision 1.13.48.1.2.2
retrieving revision 1.13.48.1.2.2.4.1
Merging differences between 1.13.48.1.2.2 and 1.13.48.1.2.2.4.1 into Bundle_ja.properties
RCS file: /cvs/core/src/org/netbeans/core/lookup/TMLookup.java,v
retrieving revision 1.17
retrieving revision 1.17.26.1
Merging differences between 1.17 and 1.17.26.1 into TMLookup.java
RCS file: /cvs/core/src/org/netbeans/core/upgrade/Attic/Bundle_ja.properties,v
retrieving revision 1.1.6.1.2.2.2.1
retrieving revision 1.1.6.1.2.2.2.1.2.1
Merging differences between 1.1.6.1.2.2.2.1 and 1.1.6.1.2.2.2.1.2.1 into Bundle_ja.properties
RCS file: /cvs/core/src/org/netbeans/core/upgrade/Attic/CopyUtil.java,v
retrieving revision 1.11.4.3.4.1
retrieving revision 1.11.4.3.4.1.2.1
Merging differences between 1.11.4.3.4.1 and 1.11.4.3.4.1.2.1 into CopyUtil.java
RCS file: /cvs/core/src/org/netbeans/core/upgrade/Attic/nbdev.cfg,v
retrieving revision 1.2.26.1.4.1
retrieving revision 1.2.26.1.4.1.2.1
Merging differences between 1.2.26.1.4.1 and 1.2.26.1.4.1.2.1 into nbdev.cfg
RCS file: /cvs/core/src/org/netbeans/core/upgrade/Attic/userdir.cfg,v
retrieving revision 1.1.14.1
retrieving revision 1.1.14.1.6.1
Merging differences between 1.1.14.1 and 1.1.14.1.6.1 into userdir.cfg
RCS file: /cvs/core/src/org/netbeans/core/windows/Bundle.properties,v
retrieving revision 1.32.2.10
retrieving revision 1.32.2.10.6.1
Merging differences between 1.32.2.10 and 1.32.2.10.6.1 into Bundle.properties
RCS file: /cvs/core/src/org/netbeans/core/windows/Bundle_ja.properties,v
retrieving revision 1.13.14.1.2.2.2.1
retrieving revision 1.13.14.1.2.2.2.1.2.1
Merging differences between 1.13.14.1.2.2.2.1 and 1.13.14.1.2.2.2.1.2.1 into Bundle_ja.properties
RCS file: /cvs/core/src/org/netbeans/core/windows/layers/ModeData.java,v
retrieving revision 1.57.2.11.4.1
retrieving revision 1.57.2.11.4.1.2.1
Merging differences between 1.57.2.11.4.1 and 1.57.2.11.4.1.2.1 into ModeData.java
RCS file: /cvs/core/src/org/netbeans/docs/tips/Attic/tip37_ja.html,v
retrieving revision 1.7.2.1.2.1
retrieving revision 1.7.2.1.2.1.4.1
Merging differences between 1.7.2.1.2.1 and 1.7.2.1.2.1.4.1 into tip37_ja.html
RCS file: /cvs/core/src/org/netbeans/docs/tips/Attic/tip6_ja.html,v
retrieving revision 1.7.2.1.2.1
retrieving revision 1.7.2.1.2.1.4.1
Merging differences between 1.7.2.1.2.1 and 1.7.2.1.2.1.4.1 into tip6_ja.html
michal@trpaslik:/builds/cvs/orion/nb_all/core$ cvs -z6 -q -n up -r orion_fcs
michal@trpaslik:/builds/cvs/orion/nb_all/core$   
michal@trpaslik:/builds/cvs/orion/nb_all$ cvs -version

Concurrent Versions System (CVS) 1.11.1p1 (client/server)

Copyright (c) 1989-2001 Brian Berliner, david d `zoo' zuhn, 
                        Jeff Polk, and other authors

CVS may be copied only under the terms of the GNU General Public License,
a copy of which can be found with the CVS distribution kit.

Specify the --help option for further information about CVS
michal@trpaslik:/builds/cvs/orion/nb_all$