diff tests/test-rename-merge1.out @ 3937:ac02810132ca

Merge with crew
author Matt Mackall <mpm@selenic.com>
date Wed, 20 Dec 2006 13:11:35 -0600
parents 0fb66912040a
children 723e0ddb6ada
line wrap: on
line diff