emc2/scrip$ CVSROOT=:ext:anon@cvs.linuxcnc.org/cvs cvs co -d x emc2/scripts
cvs checkout: Updating x
...
$ cd x
$ true > halrun.in
$ cvs up -j1.1 -j1.2 halrun.in
M halrun.in
RCS file: /cvs/emc2/scripts/halrun.in,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into halrun.in
rcsmerge: warning: conflicts during merge
$ cvs up -C halrun.in 
(Locally modified halrun.in moved to .#halrun.in.1.8)
cvs update: warning: halrun.in was lost
cvs update: move away `./halrun.in'; it is in the way
C halrun.in