# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1626301649 -7200
# Node ID 20f366db3e5fa2affa18f37fb0ee45316bc27528
# Parent  ec1d63e6444874b35bbb24bd45902931c919bfb4
dirstate: drop a duplicated assert

This very case is checked in 3 line above that one.

Differential Revision: https://phab.mercurial-scm.org/D11126

diff -r ec1d63e64448 -r 20f366db3e5f mercurial/dirstate.py
--- a/mercurial/dirstate.py	Thu Jul 15 00:22:49 2021 +0200
+++ b/mercurial/dirstate.py	Thu Jul 15 00:27:29 2021 +0200
@@ -563,7 +563,6 @@
         if merged and (clean_p1 or clean_p2):
             msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
             raise error.ProgrammingError(msg)
-        assert not (merged and (clean_p1 or clean_p1))
         if not (p1_tracked or p2_tracked or wc_tracked):
             self._drop(filename)
         elif merged: