comparison tests/test-merge-commit @ 4674:723e0ddb6ada

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