Mercurial > hg
diff tests/test-mq-subrepo.t @ 17537:31f32a96e1e3
Merge spelling fixes
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Tue, 11 Sep 2012 08:36:09 -0700 |
parents | b61a62714346 |
children | 6bbce5efc67b |
line wrap: on
line diff
--- a/tests/test-mq-subrepo.t Tue Sep 11 00:12:07 2012 +0200 +++ b/tests/test-mq-subrepo.t Tue Sep 11 08:36:09 2012 -0700 @@ -478,7 +478,7 @@ adding .hgsub $ hg -R sub update -C 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg commit -Am '#2 in parent (but be rollbacked soon)' + $ hg commit -Am '#2 in parent (but will be rolled back soon)' $ hg rollback repository tip rolled back to revision 1 (undo commit) working directory now based on revision 1