view tests/test-merge4.out @ 3531: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 b2ae81a7df29
children 4b0c9c674707
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)