X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c47ebdd0668b01a9227558c31febb0bd3d37f076..68d4260ee4aa0a6aa5f8aada02183e9f8b97f48d:/uip/conflict.c

diff --git a/uip/conflict.c b/uip/conflict.c
index a3bd1d7b..2324c650 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -92,10 +92,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [switches] [aliasfiles ...]",
 			invo_name);
 		    print_help (buf, switches, 0);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case MAILSW: 
 		    if (!(cp = *argp++) || *cp == '-')