diff tests/test-merge1.out @ 3555:a33a9af1ec03

lookup(str(x)) -> lookup(x)
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Oct 2006 14:09:15 -0500
parents d2b55e3c4e25
children 3109f012c305
line wrap: on
line diff