Mercurial > evolve
diff tests/test-uncommit.t @ 486:2111c655b4f5
fix typo
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Thu, 23 Aug 2012 18:00:29 +0200 |
| parents | d702f0d26c6a |
| children | 6989d8fe4ed2 |
line wrap: on
line diff
--- a/tests/test-uncommit.t Thu Aug 23 17:40:28 2012 +0200 +++ b/tests/test-uncommit.t Thu Aug 23 18:00:29 2012 +0200 @@ -242,7 +242,7 @@ Working directory parent is obsolete $ hg --config extensions.purge= purge $ hg uncommit -I 'set:added() and e' - 2 new conflictings changesets + 2 new conflicting changesets $ hg st --copies A e $ hg st --copies --change . @@ -286,7 +286,7 @@ Working directory parent is obsolete $ hg --config extensions.purge= purge $ hg uncommit --all -X e - 1 new conflictings changesets + 1 new conflicting changesets $ hg st --copies M b M d @@ -333,4 +333,4 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved [8] touncommit $ hg uncommit aa - 1 new unstables changesets + 1 new unstable changesets