Mercurial > hg
diff tests/test-bookmarks-pushpull.t @ 17872:7d4e98bf114d stable
bookmarks: backed out new message from changeset 52c7e171e355
Not strictly a bugfix, hasn't achieved consensus yet.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 27 Oct 2012 16:39:47 -0500 |
| parents | 52c7e171e355 |
| children | 36ed69d4593d |
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t Fri Oct 26 14:53:31 2012 +0200 +++ b/tests/test-bookmarks-pushpull.t Sat Oct 27 16:39:47 2012 -0500 @@ -337,7 +337,6 @@ added 5 changesets with 5 changes to 3 files (+2 heads) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - active bookmark: @ $ hg -R cloned-bookmarks bookmarks * @ 1:9b140be10808 X 1:9b140be10808 @@ -358,7 +357,6 @@ added 5 changesets with 5 changes to 3 files (+2 heads) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - active bookmark: @ $ cd addmarks $ echo foo > foo $ hg add foo