Mercurial > hg
diff tests/test-branches.out @ 6631:a2b13cac0922
Active branches fix (issue1104)
| author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
|---|---|
| date | Thu, 29 May 2008 22:21:29 +0200 |
| parents | 4b0c9c674707 |
| children | 7d6622eaad08 |
line wrap: on
line diff
--- a/tests/test-branches.out Mon May 26 14:20:26 2008 +0200 +++ b/tests/test-branches.out Thu May 29 22:21:29 2008 +0200 @@ -5,12 +5,15 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head marked working directory as branch c -c 5:5ca481e59b8c +marked working directory as branch d +d 6:9c581c5ff105 +b 4:22df7444f7c1 a 1:dd6b440dd85a -b 4:22df7444f7c1 (inactive) +c 5:5ca481e59b8c (inactive) default 0:19709c5a4e75 (inactive) ------- -c 5:5ca481e59b8c +d 6:9c581c5ff105 +b 4:22df7444f7c1 a 1:dd6b440dd85a --- Branch a changeset: 1:dd6b440dd85a