diff tests/test-586.out @ 4674:723e0ddb6ada

merge: warn user about divergent renames
author Matt Mackall <mpm@selenic.com>
date Thu, 21 Jun 2007 18:02:03 -0500
parents 720ae5085ee3
children c2a21fe60994
line wrap: on
line diff