X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fconflict.c;h=0d9c78c4a1ca1c7497cdb7b183adaff7f0dde5dd;hb=9e9e918ec2a607aca26253fe945ea9569475aae3;hp=527dd11332a1d0f4b2f42fd425a23d6db1d3f87d;hpb=684ec30d81e1223a282764452f4902ed4ad1c754;p=mmh diff --git a/uip/conflict.c b/uip/conflict.c index 527dd11..0d9c78c 100644 --- a/uip/conflict.c +++ b/uip/conflict.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -74,7 +73,6 @@ main(int argc, char **argv) if (context_foil(NULL) == -1) done(1); - mts_init(invo_name); arguments = getarguments(invo_name, argc, argv, 0); argp = arguments;