projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated docs/README-ATTACHMENTS, mainly to reflect that no setup is
[mmh]
/
uip
/
conflict.c
diff --git
a/uip/conflict.c
b/uip/conflict.c
index
a3bd1d7
..
2324c65
100644
(file)
--- 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);
snprintf (buf, sizeof(buf), "%s [switches] [aliasfiles ...]",
invo_name);
print_help (buf, switches, 0);
- done (1);
+ done (0);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case MAILSW:
if (!(cp = *argp++) || *cp == '-')
case MAILSW:
if (!(cp = *argp++) || *cp == '-')