diff tests/test-rename-merge1.out @ 4114:d5011e347476

Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Feb 2007 12:12:29 -0600
parents 0fb66912040a
children 723e0ddb6ada
line wrap: on
line diff