Mercurial > hg
view tests/test-merge4.out @ 7440:d2a917b27152
Fix test breakage introduced in 07faba78cf5a
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 27 Nov 2008 11:14:43 -0800 |
parents | 4b0c9c674707 |
children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)