view tests/test-branches.out @ 6025:f2335246e5c7

filemerge: wrap quotes around tool path
author Steve Borho <steve@borho.org>
date Mon, 04 Feb 2008 19:38:34 -0600
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