projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
When I fixed the long-standing makedir() bugs in January, I had the code call
[mmh]
/
uip
/
conflict.c
diff --git
a/uip/conflict.c
b/uip/conflict.c
index
29a12e7
..
cac0ea8
100644
(file)
--- a/
uip/conflict.c
+++ b/
uip/conflict.c
@@
-31,7
+31,7
@@
static struct swit switches[] = {
#define VERSIONSW 2
{ "version", 0 },
#define HELPSW 3
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
@@
-134,7
+134,7
@@
main (int argc, char **argv)
#endif /* UCI */
maildrops ();
- done (0);
+ return done (0);
}