From 327471474f6b4511722afb6607e06afea1bff2b9 Mon Sep 17 00:00:00 2001 From: Waf Project Date: Sun, 19 May 2024 12:44:53 +0200 Subject: [PATCH] Options on the command-line should not raise conflicts by default --- waflib/Options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waflib/Options.py b/waflib/Options.py index 41418238..551152c7 100644 --- a/waflib/Options.py +++ b/waflib/Options.py @@ -44,7 +44,7 @@ class ArgParser(argparse.ArgumentParser): argparse.ArgumentParser.__init__(self, add_help=False) self.ctx = ctx self.usage = self.get_usage() - + self.conflict_handler = 'resolve' def _get_formatter(self): """Initialize the argument parser to the adequate terminal width"""