X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fconflict.c;h=2324c650a4eabab9672695835eb29b491a1dfc4c;hb=5e5e8b753acc7ff1e16c7fca172a2151a6c01353;hp=a3bd1d7bbf6fd8cca8412ceeaf7aa7931edb0d4e;hpb=c47ebdd0668b01a9227558c31febb0bd3d37f076;p=mmh

diff --git a/uip/conflict.c b/uip/conflict.c
index a3bd1d7..2324c65 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 == '-')