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 _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
