comparison tests/test-filebranch.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 966632304dde
children 8feb33c2d153
comparison
equal deleted inserted replaced
4673:d8442fc0da8d 4674:723e0ddb6ada