projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When Shantonu made the new libmts.a, he swapped $(MTSLIB) and libmh.a in
[mmh]
/
uip
/
conflict.c
diff --git
a/uip/conflict.c
b/uip/conflict.c
index
1a921cd
..
c0ba63b
100644
(file)
--- a/
uip/conflict.c
+++ b/
uip/conflict.c
@@
-8,7
+8,7
@@
#include <h/mh.h>
#include <fcntl.h>
#include <h/aliasbr.h>
#include <h/mh.h>
#include <fcntl.h>
#include <h/aliasbr.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
#include <grp.h>
#include <pwd.h>
#include <grp.h>
#include <pwd.h>
@@
-31,7
+31,7
@@
static struct swit switches[] = {
#define VERSIONSW 2
{ "version", 0 },
#define HELPSW 3
#define VERSIONSW 2
{ "version", 0 },
#define HELPSW 3
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};