===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/update.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- src/usr.bin/cvs/update.c	2010/09/29 18:14:52	1.164
+++ src/usr.bin/cvs/update.c	2010/10/27 08:35:45	1.165
@@ -1,4 +1,4 @@
-/*	$OpenBSD: update.c,v 1.164 2010/09/29 18:14:52 nicm Exp $	*/
+/*	$OpenBSD: update.c,v 1.165 2010/10/27 08:35:45 tobias Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  *
@@ -580,7 +580,6 @@
 void
 update_join_file(struct cvs_file *cf)
 {
-	int flag;
 	time_t told;
 	RCSNUM *rev1, *rev2;
 	const char *state1, *state2;
@@ -688,8 +687,7 @@
 		goto out;
 	}
 
-	flag = rcs_kwexp_get(cf->file_rcs);
-	if (flag & RCS_KWEXP_NONE) {
+	if (rcs_kwexp_get(cf->file_rcs) & RCS_KWEXP_NONE) {
 		cvs_printf("non-mergable file: %s needs merge!\n",
 		    cf->file_path);
 		goto out;