projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Removed the configuration option NOPUBLICSEQ.
[mmh]
/
uip
/
conflict.c
diff --git
a/uip/conflict.c
b/uip/conflict.c
index
5710aab
..
30ff189
100644
(file)
--- a/
uip/conflict.c
+++ b/
uip/conflict.c
@@
-116,8
+116,6
@@
main(int argc, char **argv)
akv[akp++] = cp;
}
- if (akp == 0)
- akv[akp++] = AliasFile;
if (!homehead)
init_pw();
if (!mail)