Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 43807:be8552f25cab
cleanup: fix docstring formatting
This is just removing the b'' prefix (except demandimportpy2), and making sure
it is triple quoted. I skipped the mapping.py module in zope because that's 3rd
party code.
Differential Revision: https://phab.mercurial-scm.org/D7539
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 01 Dec 2019 18:46:10 -0500 |
| parents | 95d2eab0a7b9 |
| children | ebfd349eac46 |
line wrap: on
line diff
--- 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: