rust/hg-cpython/src/dirstate/item.rs
changeset 48155 b2af515b4faf
parent 48153 c29d312657d2
child 48157 b45c4dc65adc
--- a/rust/hg-cpython/src/dirstate/item.rs	Fri Oct 01 09:12:52 2021 +0200
+++ b/rust/hg-cpython/src/dirstate/item.rs	Fri Oct 01 09:14:10 2021 +0200
@@ -145,12 +145,6 @@
     }
 
     @classmethod
-    def new_merged(_cls) -> PyResult<Self> {
-        let entry = DirstateEntry::new_merged();
-        DirstateItem::create_instance(py, Cell::new(entry))
-    }
-
-    @classmethod
     def new_from_p2(_cls) -> PyResult<Self> {
         let entry = DirstateEntry::new_from_p2();
         DirstateItem::create_instance(py, Cell::new(entry))