Mercurial > hg
diff tests/test-rename-after-merge.out @ 11175:39e7f14a8286
rollback: fix up tests
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 14 May 2010 10:01:09 -0500 |
| parents | 468876bc3885 |
| children |
line wrap: on
line diff
--- a/tests/test-rename-after-merge.out Thu May 13 17:36:45 2010 -0500 +++ b/tests/test-rename-after-merge.out Fri May 14 10:01:09 2010 -0500 @@ -34,7 +34,7 @@ (branch merge, don't forget to commit) % commit issue 1476 copies: c2 (c1) -rolling back to revision 3 (undo commit) +rolling back to revision 2 (undo commit) 2 files updated, 0 files merged, 2 files removed, 0 files unresolved % merge heads again 2 files updated, 0 files merged, 0 files removed, 0 files unresolved