Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust/hg-core/src/dirstate_tree/dispatch.rs
changeset 47527 c6b91a9c242a
parent 47525 fe4641cf9b72
child 47535 6025353c9c55 
--- a/rust/hg-core/src/dirstate_tree/dispatch.rs	Sun Jul 04 01:44:43 2021 +0200
+++ b/rust/hg-core/src/dirstate_tree/dispatch.rs	Sun Jul 04 01:48:11 2021 +0200
@@ -49,6 +49,7 @@
         filename: &HgPath,
         entry: DirstateEntry,
         added: bool,
+        merged: bool,
         from_p2: bool,
         possibly_dirty: bool,
     ) -> Result<(), DirstateError>;
@@ -289,10 +290,11 @@
         filename: &HgPath,
         entry: DirstateEntry,
         added: bool,
+        merged: bool,
         from_p2: bool,
         possibly_dirty: bool,
     ) -> Result<(), DirstateError> {
-        self.add_file(filename, entry, added, from_p2, possibly_dirty)
+        self.add_file(filename, entry, added, merged, from_p2, possibly_dirty)
     }
 
     fn remove_file(
mercurial