Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert.out @ 3562:730ca93ed788
convert dict(zip(x,x)) to dict.fromkeys(x)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 27 Oct 2006 00:38:42 -0500 |
parents | d2b55e3c4e25 |
children |
line wrap: on
line source
1:016807e6fdaf 0:eb43f19ff115 016807e6fdaf tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved eb43f19ff115 eb43f19ff115+ reverting file1 ? file1.orig eb43f19ff115 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip 0 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip