Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4.out @ 4924:b8076522e889
Simplify update.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 18 Jul 2007 14:00:55 -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)