# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1557877249 25200
# Node ID 8988e640a8ac8c69075b565722e13afc534ed4c3
# Parent  65b3ef162b392e56bc9734d1ddfbb6fb1074ca16
commit: fix a typo ("form p1" -> "from p1")

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

diff -r 65b3ef162b39 -r 8988e640a8ac mercurial/localrepo.py
--- 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:
diff -r 65b3ef162b39 -r 8988e640a8ac tests/test-graft.t
--- a/tests/test-graft.t	Sat Apr 27 11:48:26 2019 -0700
+++ b/tests/test-graft.t	Tue May 14 16:40:49 2019 -0700
@@ -755,7 +755,7 @@
   committing files:
   b
   warning: can't find ancestor for 'b' copied from 'a'!
-  reusing manifest form p1 (listed files actually unchanged)
+  reusing manifest from p1 (listed files actually unchanged)
   committing changelog
   updating the branch cache
   $ hg log -r 'destination(13)'
diff -r 65b3ef162b39 -r 8988e640a8ac tests/test-merge-no-file-change.t
--- a/tests/test-merge-no-file-change.t	Sat Apr 27 11:48:26 2019 -0700
+++ b/tests/test-merge-no-file-change.t	Tue May 14 16:40:49 2019 -0700
@@ -137,7 +137,7 @@
   $ hg ci --debug -m merge
   committing files:
   b
-  reusing manifest form p1 (listed files actually unchanged)
+  reusing manifest from p1 (listed files actually unchanged)
   committing changelog
   updating the branch cache
   committed changeset 3:c8d50407916ef8a5a97cb6e36ca9bc844a6ee13e