projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Back out previous, completely broken, change (due to a foulup I was
[mmh]
/
uip
/
conflict.c
diff --git
a/uip/conflict.c
b/uip/conflict.c
index
1713b15
..
8247ff0
100644
(file)
--- a/
uip/conflict.c
+++ b/
uip/conflict.c
@@
-139,7
+139,8
@@
main (int argc, char **argv)
#endif /* UCI */
maildrops ();
#endif /* UCI */
maildrops ();
- return done (0);
+ done (0);
+ return 1;
}
}