diff tests/test-rename-merge1.out @ 4209:dbc3846c09a1

Merge with -stable, fix small test failure
author Matt Mackall <mpm@selenic.com>
date Wed, 14 Mar 2007 01:26:09 -0500
parents 0fb66912040a
children 723e0ddb6ada
line wrap: on
line diff