projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the rcvstoreproc/rcvpackproc vars.
[mmh]
/
uip
/
conflict.c
diff --git
a/uip/conflict.c
b/uip/conflict.c
index
527dd11
..
0d9c78c
100644
(file)
--- a/
uip/conflict.c
+++ b/
uip/conflict.c
@@
-9,7
+9,6
@@
#include <h/mh.h>
#include <fcntl.h>
#include <h/aliasbr.h>
#include <h/mh.h>
#include <fcntl.h>
#include <h/aliasbr.h>
-#include <h/mts.h>
#include <h/utils.h>
#include <grp.h>
#include <pwd.h>
#include <h/utils.h>
#include <grp.h>
#include <pwd.h>
@@
-74,7
+73,6
@@
main(int argc, char **argv)
if (context_foil(NULL) == -1)
done(1);
if (context_foil(NULL) == -1)
done(1);
- mts_init(invo_name);
arguments = getarguments(invo_name, argc, argv, 0);
argp = arguments;
arguments = getarguments(invo_name, argc, argv, 0);
argp = arguments;