[Request] [+ ] D11896: doc: remove a spurious ^L in some doc
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Fri Dec 10 21:45:33 UTC 2021
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
This was wrongly introduced in D11784 <https://phab.mercurial-scm.org/D11784>.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D11896
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -2207,7 +2207,7 @@
# it makes the "different write with same mtime" issue
# virtually vanish. However, dirstate v1 cannot store such
# precision and a bunch of python-runtime, operating-system and
- # filesystem does not provide use with such precision, so we
+ # filesystem does not provide use with such precision, so we
# have to operate as if it wasn't available.
if getfiledata:
ambiguous_mtime = {}
To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20211210/cc8e71b0/attachment.html>
More information about the Mercurial-patches
mailing list