Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4.out @ 2861:1f813d4fbcc8
Fix bad merge with crew
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Fri, 11 Aug 2006 16:30:24 -0700 |
parents | b2ae81a7df29 |
children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)