X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/03fe41ba1d68108808c966c6d7ff74bd8c1d648c..4548a3ecc4248a1d4bd4fdd45d9a2bb1e61d1e70:/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 == '-')