[Updated] D11896: doc: remove a spurious ^L in some doc

[marmoute (Pierre-Yves David)]

Closed by commit rHG2332a1d8e7eb: doc: remove a spurious ^L in some doc (authored by marmoute).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11896?vs=31427&id=31429

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11896/new/

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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211210/b24b2c66/attachment-0002.html>