rust/hg-core/src/dirstate/entry.rs
changeset 48153 c29d312657d2
parent 48152 8f88307f8e07
child 48154 7a8c9869e4fe
--- a/rust/hg-core/src/dirstate/entry.rs	Fri Oct 01 03:29:33 2021 +0200
+++ b/rust/hg-core/src/dirstate/entry.rs	Fri Oct 01 03:30:00 2021 +0200
@@ -169,11 +169,6 @@
         self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
     }
 
-    pub fn merged(&self) -> bool {
-        self.flags
-            .contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)
-    }
-
     pub fn added(&self) -> bool {
         self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent()
     }