comparison tests/test-merge3 @ 4674:723e0ddb6ada

merge: warn user about divergent renames
author Matt Mackall <mpm@selenic.com>
date Thu, 21 Jun 2007 18:02:03 -0500
parents 7544700fd931
children 6a64813276ed
comparison
equal deleted inserted replaced
4673:d8442fc0da8d 4674:723e0ddb6ada