Mercurial > hg
comparison tests/test-rename-after-merge.t @ 13455:053c042118bc stable
rollback, i18n: avoid parameterized message
| author | Wagner Bruna <wbruna@softwareexpress.com.br> |
|---|---|
| date | Mon, 21 Feb 2011 20:58:54 -0300 |
| parents | 1e497df514e2 |
| children | f2719b387380 |
comparison
equal
deleted
inserted
replaced
| 13454:afc84a879ac8 | 13455:053c042118bc |
|---|---|
| 96 $ hg log -r tip -C -v | grep copies | 96 $ hg log -r tip -C -v | grep copies |
| 97 copies: c2 (c1) | 97 copies: c2 (c1) |
| 98 | 98 |
| 99 $ hg rollback | 99 $ hg rollback |
| 100 repository tip rolled back to revision 2 (undo commit) | 100 repository tip rolled back to revision 2 (undo commit) |
| 101 working directory now based on revision 2 and 1 | 101 working directory now based on revisions 2 and 1 |
| 102 | 102 |
| 103 $ hg up -C . | 103 $ hg up -C . |
| 104 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | 104 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 105 | 105 |
| 106 Merge heads again: | 106 Merge heads again: |