Mercurial > hg

diff mercurial/localrepo.py @ 42286:8988e640a8ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: fix a typo ("form p1" -> "from p1") Differential Revision: https://phab.mercurial-scm.org/D6375
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 14 May 2019 16:40:49 -0700
parents 39b63f9d7464
children 278dcb24e535
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sat Apr 27 11:48:26 2019 -0700
+++ b/mercurial/localrepo.py	Tue May 14 16:40:49 2019 -0700
@@ -2642,7 +2642,7 @@
                                     p1.manifestnode(), p2.manifestnode(),
                                     added, drop, match=self.narrowmatch())
                 else:
-                    self.ui.debug('reusing manifest form p1 (listed files '
+                    self.ui.debug('reusing manifest from p1 (listed files '
                                   'actually unchanged)\n')
                     mn = p1.manifestnode()
             else: