tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Thu, 26 Oct 2006 14:09:15 -0500
changeset 3555 a33a9af1ec03
parent 2175 b2ae81a7df29
permissions -rw-r--r--
lookup(str(x)) -> lookup(x)

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)