# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1639153221 -3600
# Node ID b5f8d9e55d42120441345ca35098b61b2b04739e
# Parent  dc2ef4b4d9a97b9d1f603b1bb4b4e9625a4e3d52
doc: remove a spurious ^L in some doc

This was wrongly introduced in D11784.

Differential Revision: https://phab.mercurial-scm.org/D11896

diff -r dc2ef4b4d9a9 -r b5f8d9e55d42 mercurial/merge.py
--- a/mercurial/merge.py	Mon Dec 06 21:30:32 2021 +0100
+++ b/mercurial/merge.py	Fri Dec 10 17:20:21 2021 +0100
@@ -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 = {}