Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-branches.out @ 5443:58496354773f
Merge with crew
Those crew folks are getting lazy about pulling from upstream before
committing.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 11 Oct 2007 00:46:40 -0500 |
parents | 6858a7477a5e |
children |
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