Mercurial > hg
diff tests/test-backout.out @ 8779:708938509732
Improve English for help text of many core hg commands.
co-author: Greg Ward <greg-hg@gerg.ca>
| author | timeless <timeless@gmail.com> |
|---|---|
| date | Tue, 09 Jun 2009 21:51:34 -0400 |
| parents | fb374b1b3911 |
| children | f0bfe42c7b1f |
line wrap: on
line diff
--- a/tests/test-backout.out Wed Jun 10 15:10:21 2009 +0200 +++ b/tests/test-backout.out Tue Jun 09 21:51:34 2009 -0400 @@ -19,10 +19,10 @@ adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved -abort: cannot back out change on a different branch +abort: cannot backout change on a different branch adding c created new head -abort: cannot back out change on a different branch +abort: cannot backout change on a different branch # backout with merge adding a reverting a @@ -54,7 +54,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) # backout of merge should fail -abort: cannot back out a merge changeset without --parent +abort: cannot backout a merge changeset without --parent # backout of merge with bad parent should fail abort: cb9a9f314b8b is not a parent of b2f3bb92043e # backout of non-merge with parent should fail