Mercurial > hg-stable
diff tests/test-merge6.out @ 775:122449dd89db
Fix up test results
No more errnos
diff | sed changes
.out message ok
| author | mpm@selenic.com |
|---|---|
| date | Tue, 26 Jul 2005 19:23:59 -0800 |
| parents | 7e4843b7efd2 |
| children | 445970ccf57a 8f5637f0a0c0 0902ffece4b4 |
line wrap: on
line diff
--- a/tests/test-merge6.out Tue Jul 26 19:03:45 2005 -0800 +++ b/tests/test-merge6.out Tue Jul 26 19:23:59 2005 -0800 @@ -27,8 +27,8 @@ searching for changes adding changesets adding manifests -adding file revisions -modified 1 files, added 1 changesets and 1 new revisions +adding file changes +added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) + hg update -m + hg commit -m 'commit test' -d '0 0' @@ -42,8 +42,8 @@ searching for changes adding changesets adding manifests -adding file revisions -modified 0 files, added 1 changesets and 0 new revisions +adding file changes +added 1 changesets with 0 changes to 0 files (run 'hg update' to get a working copy) + hg update -m + hg commit -m 'commit test' -d '0 0'