Mercurial > hg
diff mercurial/merge.py @ 48450:b5f8d9e55d42
doc: remove a spurious ^L in some doc
This was wrongly introduced in D11784.
Differential Revision: https://phab.mercurial-scm.org/D11896
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 10 Dec 2021 17:20:21 +0100 |
parents | 38941a28406a |
children | 7e503eff3c76 |
line wrap: on
line diff
--- 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 = {}