diff tests/test-rename-merge1.out @ 3804:302ffecdd726

Merge with crew
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Dec 2006 12:45:27 -0600
parents 0fb66912040a
children 723e0ddb6ada
line wrap: on
line diff