Mercurial > hg
view tests/test-branches.out @ 6404:f08662abdf3f
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 29 Mar 2008 21:15:54 +0100 |
parents | 4b0c9c674707 |
children | a2b13cac0922 |
line wrap: on
line source
marked working directory as branch a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch b created new head 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head marked working directory as branch c c 5:5ca481e59b8c a 1:dd6b440dd85a b 4:22df7444f7c1 (inactive) default 0:19709c5a4e75 (inactive) ------- c 5:5ca481e59b8c a 1:dd6b440dd85a --- Branch a changeset: 1:dd6b440dd85a branch: a user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: Adding a branch ---- Branch b changeset: 4:22df7444f7c1 branch: b parent: 2:ac22033332d1 user: test date: Thu Jan 01 00:00:04 1970 +0000 summary: Adding b branch head 2 changeset: 3:aee39cd168d0 branch: b user: test date: Thu Jan 01 00:00:03 1970 +0000 summary: Adding b branch head 1 changeset: 2:ac22033332d1 branch: b parent: 0:19709c5a4e75 user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: Adding b branch