Patchwork D11896: doc: remove a spurious ^L in some doc

login
register
mail settings
Submitter phabricator
Date Dec. 10, 2021, 9:45 p.m.
Message ID <differential-rev-PHID-DREV-dhdeez23mmrcechwky2r-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50222/
State Superseded
Headers show

Comments

phabricator - Dec. 10, 2021, 9:45 p.m.
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




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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 = {}