Mercurial Mercurial > hg / 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.
mercurial/dirstatemap.py
changeset 47513 10e740292dff
parent 47511 eaae39894312
child 47514 559aee84b889 
--- a/mercurial/dirstatemap.py	Sun Jul 04 03:29:20 2021 +0200
+++ b/mercurial/dirstatemap.py	Sat Jul 03 04:07:21 2021 +0200
@@ -171,7 +171,7 @@
             # would be nice.
             if entry is not None:
                 # backup the previous state
-                if entry[0] == b'm':  # merge
+                if entry.merged:  # merge
                     size = NONNORMAL
                 elif entry[0] == b'n' and entry[2] == FROM_P2:  # other parent
                     size = FROM_P2
Mercurial