view tests/test-branches.out @ 5672:8a65ea986755

Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 27 Dec 2007 13:39:03 +0100
parents 6858a7477a5e
children 57c1a7052982
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
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