Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4.out @ 3911:fe075ddf3272
convert-repo: avoid adding bogus value to shamap on tag update
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 16 Dec 2006 14:41:34 -0600 |
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)