diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py index fabf687df0ff3ed9fcaa332090d201f73c81d2bb_bWVyY3VyaWFsL3B1cmUvcGFyc2Vycy5weQ==..e2da3ec94169ca75aaaea63de2c75d45c7df2905_bWVyY3VyaWFsL3B1cmUvcGFyc2Vycy5weQ== 100644 --- a/mercurial/pure/parsers.py +++ b/mercurial/pure/parsers.py @@ -102,6 +102,7 @@ msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' raise error.ProgrammingError(msg) + assert not (merged and not p1_tracked) self._wc_tracked = wc_tracked self._p1_tracked = p1_tracked self._p2_tracked = p2_tracked