tests/test-branches.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Aug 2007 17:20:51 +0200
changeset 5161 24d306834de5
parent 4675 6858a7477a5e
permissions -rw-r--r--
merge with -stable

marked working directory as branch a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
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