Mercurial > hg
diff tests/test-rebase-check-restore.out @ 11197:4bb4895e1693
strip: be quiet about temporary internal bundle
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 19 May 2010 19:46:39 -0500 |
parents | b214066b7e1d |
children | b345b1cc124f |
line wrap: on
line diff
--- a/tests/test-rebase-check-restore.out Wed May 19 22:32:40 2010 +0200 +++ b/tests/test-rebase-check-restore.out Wed May 19 19:46:39 2010 -0500 @@ -55,7 +55,6 @@ abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % - Solve the conflict and go on -saving bundle to adding branch adding changesets adding manifests