diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -2642,7 +2642,7 @@ class localrepository(object): 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 --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -755,7 +755,7 @@ Transplants of grafts can find a destina 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 --git a/tests/test-merge-no-file-change.t b/tests/test-merge-no-file-change.t --- a/tests/test-merge-no-file-change.t +++ b/tests/test-merge-no-file-change.t @@ -137,7 +137,7 @@ An identical file added at both parents, $ 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