comparison tests/test-log.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 e0bc2c575044
children 180a3eee4b75
comparison
equal deleted inserted replaced
4673:d8442fc0da8d 4674:723e0ddb6ada