=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/merge.c,v retrieving revision 1.8 retrieving revision 1.9 diff -c -r1.8 -r1.9 *** src/usr.bin/rcs/merge.c 2014/10/02 06:23:15 1.8 --- src/usr.bin/rcs/merge.c 2014/10/10 08:15:25 1.9 *************** *** 1,4 **** ! /* $OpenBSD: merge.c,v 1.8 2014/10/02 06:23:15 otto Exp $ */ /* * Copyright (c) 2006 Xavier Santolaria * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: merge.c,v 1.9 2014/10/10 08:15:25 otto Exp $ */ /* * Copyright (c) 2006 Xavier Santolaria * All rights reserved. *************** *** 40,46 **** BUF *bp; flags = labels = 0; - status = D_ERROR; /* * Using getopt(3) and not rcs_getopt() because merge(1) --- 40,45 ----