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.
mercurial/merge.py
changeset 43787 be8552f25cab
parent 43713 95d2eab0a7b9
child 43796 ebfd349eac46 
--- a/mercurial/merge.py	Wed Nov 13 20:42:13 2019 +0100
+++ b/mercurial/merge.py	Sun Dec 01 18:46:10 2019 -0500
@@ -2093,7 +2093,7 @@
 
 
 def recordupdates(repo, actions, branchmerge, getfiledata):
-    b"record merge actions to the dirstate"
+    """record merge actions to the dirstate"""
     # remove (must come first)
     for f, args, msg in actions.get(ACTION_REMOVE, []):
         if branchmerge:
mercurial