diff -r 8bcae9bf9e8d -r c6b91a9c242a rust/hg-cpython/src/dirstate/dispatch.rs
--- a/rust/hg-cpython/src/dirstate/dispatch.rs	Sun Jul 04 01:44:43 2021 +0200
+++ b/rust/hg-cpython/src/dirstate/dispatch.rs	Sun Jul 04 01:48:11 2021 +0200
@@ -26,6 +26,7 @@
         filename: &HgPath,
         entry: DirstateEntry,
         added: bool,
+        merged: bool,
         from_p2: bool,
         possibly_dirty: bool,
     ) -> Result<(), DirstateError> {
@@ -33,6 +34,7 @@
             filename,
             entry,
             added,
+            merged,
             from_p2,
             possibly_dirty,
         )