Mercurial > hg
diff tests/test-merge-no-file-change.t @ 42286:8988e640a8ac
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 | 46da52f4b820 |
children |
line wrap: on
line diff
--- 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